ooo-build r12762 - in trunk: . patches/dev300
- From: jannieuw svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12762 - in trunk: . patches/dev300
- Date: Tue, 3 Jun 2008 14:56:05 +0000 (UTC)
Author: jannieuw
Date: Tue Jun 3 14:56:05 2008
New Revision: 12762
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12762&view=rev
Log:
2008-06-03 Jan Nieuwenhuizen <janneke gnu org>
* patches/dev300/layout-tab-sfx2.diff:
* patches/dev300/layout-tab-toolkit.diff: Update from GIT: Fix
sizing and dialog buttons dislay while switching.
Modified:
trunk/ChangeLog
trunk/patches/dev300/layout-tab-sfx2.diff
trunk/patches/dev300/layout-tab-toolkit.diff
Modified: trunk/patches/dev300/layout-tab-sfx2.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-sfx2.diff (original)
+++ trunk/patches/dev300/layout-tab-sfx2.diff Tue Jun 3 14:56:05 2008
@@ -82,7 +82,7 @@
sal_uInt16 nCount = pImp->aArr.Count();
for (sal_uInt16 i=0; i<nCount; i++)
diff --git a/source/dialog/tabdlg.cxx b/source/dialog/tabdlg.cxx
-index 57a8e89..36df513 100644
+index 57a8e89..7bcca09 100644
--- sfx2/source/dialog/tabdlg.cxx
+++ sfx2/source/dialog/tabdlg.cxx
@@ -56,6 +56,7 @@
@@ -93,7 +93,20 @@
#include "dialog.hrc"
#include "helpid.hrc"
-@@ -922,6 +923,11 @@ void SfxTabDialog::AddTabPage
+@@ -171,6 +172,12 @@ void SfxTabDialogController::StateChanged( USHORT /*nSID*/, SfxItemState /*eStat
+ for ( USHORT n=0; n<pDialog->aTabCtrl.GetPageCount(); n++ )
+ {
+ USHORT nPageId = pDialog->aTabCtrl.GetPageId( n );
++ if ( layout::TabPage* page = pDialog->layoutPages[nPageId] )
++ {
++ page->Reset( pSetItem->GetItemSet() );
++ bDialogStarted = TRUE;
++ }
++
+ SfxTabPage* pTabPage = (SfxTabPage*) pDialog->aTabCtrl.GetTabPage( nPageId );
+ if ( pTabPage )
+ {
+@@ -922,6 +929,11 @@ void SfxTabDialog::AddTabPage
}
#endif
@@ -105,7 +118,7 @@
// -----------------------------------------------------------------------
void SfxTabDialog::RemoveTabPage( USHORT nId )
-@@ -1379,6 +1385,25 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+@@ -1379,6 +1391,24 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
*/
{
@@ -115,23 +128,22 @@
+ TabPage *vclPage = page->GetTabPage();
+ TabControl *dialog = pTabCtrl;
+ page->Reset( page->GetItemSet() );
-+ dialog->SetTabPage( newId, vclPage );
+ page->ActivatePage();
++ dialog->SetTabPage( newId, vclPage );
+
+ Size tabSize = vclPage->GetSizePixel();
+ Size dialogSize = dialog->GetTabPageSizePixel();
++ OSL_TRACE ("%s: tabSize: %d, %d", __FUNCTION__, tabSize.Width(), tabSize.Height() );
++ OSL_TRACE ("%s: dialogSize: %d, %d", __FUNCTION__, dialogSize.Width(), dialogSize.Height() );
+
-+ if ( dialogSize.Width() < tabSize.Width()
-+ || dialogSize.Height() < tabSize.Height() )
-+ dialog->SetTabPageSizePixel( tabSize );
-+
++ dialog->SetTabPageSizePixel( tabSize );
+ return 0;
+ }
+
DBG_ASSERT( pImpl->pData->Count(), "keine Pages angemeldet" );
const USHORT nId = pTabCtrl->GetCurPageId();
SFX_APP();
-@@ -1455,6 +1480,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
+@@ -1455,6 +1485,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
*/
{
Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff (original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff Tue Jun 3 14:56:05 2008
@@ -33,6 +33,19 @@
+
+* Also See workben/layout/README.
\ No newline at end of file
+diff --git a/doc/layout/TODO b/doc/layout/TODO
+index e6fb771..abd717c 100644
+--- toolkit/doc/layout/TODO
++++ toolkit/doc/layout/TODO
+@@ -107,6 +107,8 @@ grep zoom.src svx/source/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t
+ must redo.
+ *** wordcount
+ grep wordcountdialog.src sw/source/ui/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\workben.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/FL_\([A-Z]*\)_label/FL_\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/'s
++*** sortdlg
++grep sortdlg.src ../../../sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\sort-options.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' | grep -E ' (nl|de|en-US) ' > localize-str.sdf
+
+
+ * i18n
diff --git a/inc/layout/layout-post.hxx b/inc/layout/layout-post.hxx
index 25e1cfc..09f90bf 100644
--- toolkit/inc/layout/layout-post.hxx
@@ -352,7 +365,7 @@
}
diff --git a/source/awt/vclxsplitter.cxx b/source/awt/vclxsplitter.cxx
-index cecc592..f33b626 100644
+index cecc592..9b73c91 100644
--- toolkit/source/awt/vclxsplitter.cxx
+++ toolkit/source/awt/vclxsplitter.cxx
@@ -54,9 +54,9 @@ using namespace ::com::sun::star::beans;
@@ -384,12 +397,29 @@
, Box_Base()
{
DBG_CTOR( VCLXSplitter, NULL );
+@@ -230,13 +230,13 @@ void SAL_CALL VCLXSplitter::allocateArea(
+
+ void VCLXSplitter::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
+ {
+- VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
++ VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
+ }
+
+ void SAL_CALL VCLXSplitter::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
+ {
+- VCLXWindow::setProperty( PropertyName, Value );
+- }
++ VCLXWindow::setProperty( PropertyName, Value );
++}
+
+ Any SAL_CALL VCLXSplitter::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
+ {
diff --git a/source/awt/vclxtabpage.cxx b/source/awt/vclxtabpage.cxx
new file mode 100644
-index 0000000..5f29d26
+index 0000000..24b1e99
--- /dev/null
+++ toolkit/source/awt/vclxtabpage.cxx
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,160 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -431,6 +461,7 @@
+#include <com/sun/star/awt/PosSize.hpp>
+#include <toolkit/helper/convert.hxx>
+#include <vcl/tabpage.hxx>
++#include <vcl/tabctrl.hxx>
+
+namespace layoutimpl
+{
@@ -472,6 +503,9 @@
+void VCLXTabPage::ProcessWindowEvent( VclWindowEvent const& event )
+{
+ ::vos::OClearableGuard aGuard( GetMutex() );
++
++ OSL_TRACE ("%s: %d", __FUNCTION__, event.GetId());
++
+#if 0
+ //Bin::ProcessWindowEvent( event );
+ switch ( event.GetId() )
@@ -488,30 +522,51 @@
+#endif
+}
+
-+void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& rArea )
++void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area )
+ throw (uno::RuntimeException)
+{
-+ awt::Size reqSize = Bin::getMinimumSize();
-+ reqSize.Height = getHeightForWidth( rArea.Width );
++ awt::Size curSize = getSize();
++ awt::Size reqSize = getMinimumSize();
++ reqSize.Height = getHeightForWidth( area.Width );
++
++ if ( curSize.Width && reqSize.Width > curSize.Width )
++ reqSize.Width = curSize.Width;
++ if ( curSize.Height && reqSize.Height > curSize.Height )
++ reqSize.Height = curSize.Height;
++
++ OSL_TRACE ("%s: ismousetransparent, %d", __FUNCTION__, GetWindow()->IsMouseTransparent() );
++ Size window = GetWindow()->GetSizePixel();
++ Size parent = GetWindow()->GetParent()->GetSizePixel();
++
++ Point pos = GetWindow()->GetPosPixel();
++ OSL_TRACE ("%s: curpos: %d ,%d", __FUNCTION__, pos.X(), pos.Y() );
++
++ OSL_TRACE ("%s: cursize: %d ,%d", __FUNCTION__, curSize.Width, curSize.Height );
++ OSL_TRACE ("%s: area: %d, %d", __FUNCTION__, area.Width, area.Height );
++ OSL_TRACE ("%s: reqSize: %d, %d", __FUNCTION__, reqSize.Width, reqSize.Height );
++ OSL_TRACE ("%s: parent: %d, %d", __FUNCTION__, parent.Width(), parent.Height() );
++ OSL_TRACE ("%s: window: %d, %d", __FUNCTION__, window.Width(), window.Height() );
+
+ if ( !bRealized )
+ {
+ setPosSize( 0, 0, reqSize.Width, reqSize.Height, awt::PosSize::SIZE );
++ //setPosSize( 0, 0, reqSize.Width, reqSize.Height, awt::PosSize::POSSIZE );
+ bRealized = true;
-+ setVisible( true );
++ /* Must NOT set visible for OOo integration */
++ //setVisible( true );
+ }
+ else
+ {
-+ awt::Size curSize = getSize();
+ if ( reqSize.Width > curSize.Width )
+ setPosSize( 0, 0, reqSize.Width, 0, awt::PosSize::WIDTH );
+ if ( reqSize.Height > curSize.Height )
+ setPosSize( 0, 0, 0, reqSize.Height, awt::PosSize::HEIGHT );
+ }
+
-+ awt::Size size = getSize();
-+ maAllocation.Width = size.Width;
-+ maAllocation.Height = size.Height;
++ awt::Size newSize = getSize();
++ OSL_TRACE ("%s: newSize: %d, %d", __FUNCTION__, newSize.Width, newSize.Height );
++ maAllocation.Width = newSize.Width;
++ maAllocation.Height = newSize.Height;
+
+ Bin::allocateArea( maAllocation );
+}
@@ -690,7 +745,7 @@
return children;
diff --git a/source/layout/helper.cxx b/source/layout/helper.cxx
-index 78cdbd4..e629394 100644
+index 78cdbd4..92e63ea 100644
--- toolkit/source/layout/helper.cxx
+++ toolkit/source/layout/helper.cxx
@@ -40,6 +40,7 @@
@@ -790,7 +845,7 @@
uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
uno::Reference< uno::XInterface > xParent,
OUString aName, long WindowAttributes )
-@@ -488,6 +511,20 @@ uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
+@@ -488,6 +511,29 @@ uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
OSL_TRACE( "%s: parent=%p (%s)\n", __FUNCTION__, pParent, typeid( *pParent ).name() );
pNewComp = new layoutimpl::VCLXPlugin( pNewWindow, ImplGetWinBits( WindowAttributes, 0 ) );
}
@@ -798,12 +853,21 @@
+ {
+ if ( !pParent )
+ pParent = layout::TabPage::global_parent;
-+ pNewWindow = new TabPage( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
++
++ //pNewWindow = new TabPage( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
++ WindowAttributes ^= awt::WindowAttribute::SHOW;
++ WinBits nStyle = ImplGetWinBits( WindowAttributes, 0 );
++ nStyle |= WB_HIDE;
++ //nStyle |= WB_NODIALOGCONTROL;
++ //nStyle |= WB_DIALOGCONTROL;
++ //nStyle = 2147483714L;
++ OSL_TRACE( "in bits=%lu", nStyle );
++ pNewWindow = new TabPage( pParent, nStyle );
+ pNewComp = new VCLXTabPage( pNewWindow );
-+
+ }
+ else if ( aName.equalsAscii( "string" ) )
+ {
++ // FIXME: move <string>s.text to simple map<string> in root?
+ WindowAttributes &= ~awt::WindowAttribute::SHOW;
+ pNewWindow = new Window( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
+ pNewComp = new layoutimpl::LocalizedString();
@@ -826,10 +890,10 @@
uno::Reference< uno::XInterface >(), uno::Any() );
diff --git a/source/layout/localized-string.cxx b/source/layout/localized-string.cxx
new file mode 100644
-index 0000000..29083c5
+index 0000000..9bc9df3
--- /dev/null
+++ toolkit/source/layout/localized-string.cxx
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,87 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -897,19 +961,6 @@
+ return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
+}
+
-+#if 0
-+// XTypeProvider
-+IMPL_XTYPEPROVIDER_START( LocalizedString )
-+ getCppuType( ( uno::Reference< awt::XFixedText>* ) NULL ),
-+ VCLXWindow::getTypes()
-+IMPL_XTYPEPROVIDER_END
-+
-+uno::Reference< accessibility::XAccessibleContext > LocalizedString::CreateAccessibleContext()
-+{
-+ return getAccessibleFactory().createAccessibleContext( this );
-+}
-+#endif
-+
+void LocalizedString::setText( OUString const& s )
+ throw(uno::RuntimeException)
+{
@@ -1550,7 +1601,7 @@
} // namespace layout
diff --git a/source/vclcompat/wrapper.cxx b/source/vclcompat/wrapper.cxx
-index 6188ac1..117ec7c 100644
+index 6188ac1..0b02790 100644
--- toolkit/source/vclcompat/wrapper.cxx
+++ toolkit/source/vclcompat/wrapper.cxx
@@ -36,23 +36,34 @@
@@ -1773,7 +1824,7 @@
short Dialog::Execute()
{
if ( !getImpl().mxDialog.is() )
-@@ -391,13 +421,145 @@ void Dialog::EndDialog( long nResult )
+@@ -391,13 +421,95 @@ void Dialog::EndDialog( long nResult )
getImpl().mxDialog->endDialog( nResult );
}
@@ -1794,26 +1845,6 @@
+ , mxTabPage( xPeer, uno::UNO_QUERY )
+ {
+ }
-+ void redraw()
-+ {
-+ uno::Reference <awt::XWindow> ref( mxWindow, uno::UNO_QUERY );
-+ ::Window* window = VCLXWindow::GetImplementation( ref )->GetWindow();
-+ ::Window* parent = window->GetParent();
-+
-+ ::Rectangle r = Rectangle( parent->GetPosPixel(),
-+ parent->GetSizePixel() );
-+
-+ parent->Invalidate( r, INVALIDATE_CHILDREN | INVALIDATE_NOCHILDREN );
-+ parent->SetPosSizePixel( 0, 0, r.nRight - r.nLeft, r.nBottom - r.nTop,
-+ awt::PosSize::SIZE );
-+
-+ r = Rectangle( window->GetPosPixel(),
-+ window->GetSizePixel() );
-+
-+ window->Invalidate( r, INVALIDATE_CHILDREN | INVALIDATE_NOCHILDREN );
-+ window->SetPosSizePixel( 0, 0, r.nRight - r.nLeft, r.nBottom - r.nTop,
-+ awt::PosSize::SIZE );
-+ }
+};
+
+::Window* TabPage::global_parent = 0;
@@ -1823,59 +1854,29 @@
+TabPage::TabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
+ : Context( pXMLPath )
+ , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
++ , bHasExchangeSupport( false )
+{
+ if ( pParent )
+ SetParent( pParent );
-+
-+// GetTabPage()->EnableChildTransparentMode( false );
-+// GetTabPage()->SetPaintTransparent( false );
+}
+
+TabPage::TabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
+ : Context( pXMLPath )
+ , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
++ , bHasExchangeSupport( false )
+{
+ if ( pParent )
+ SetParent( pParent );
-+
-+// GetTabPage()->EnableChildTransparentMode( false );
-+// GetTabPage()->SetPaintTransparent( false );
+}
+
+IMPL_GET_WINDOW( TabPage );
+
+void TabPage::ActivatePage()
+{
-+// GetTabPage()->EnableChildTransparentMode( true );
-+// GetTabPage()->SetPaintTransparent( true );
-+// getImpl().redraw();
-+
-+
-+ awt::Size curSize = GetVCLXWindow()->getSize();
-+
-+ //CSTDIO
-+ printf ("%s: curSize: %d, %d\n", __FUNCTION__, curSize.Width, curSize.Height );
-+
-+ ::Window *page = GetTabPage();
-+ if (1)
-+ {
-+ page->EnableChildTransparentMode( true );
-+ page->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
-+ ////SetParentClipMode( PARENTCLIPMODE_CLIP );
-+ page->SetPaintTransparent( true );
-+ }
-+ else
-+ {
-+ page->EnableChildTransparentMode( false );
-+ page->SetParentClipMode( 0 );
-+ page->SetPaintTransparent( false );
-+ }
-+
+}
+
+void TabPage::DeactivatePage()
+{
-+// GetTabPage()->Hide();
+}
+
+#if 0
@@ -1920,7 +1921,7 @@
class FixedLineImpl : public ControlImpl
{
public:
-@@ -407,8 +569,8 @@ public:
+@@ -407,8 +519,8 @@ public:
}
};
@@ -1931,7 +1932,7 @@
bool FixedLine::IsEnabled()
{
-@@ -433,10 +595,10 @@ public:
+@@ -433,10 +545,10 @@ public:
}
};
@@ -1945,7 +1946,7 @@
{
if ( !getImpl().mxFixedText.is() )
return;
-@@ -452,8 +614,8 @@ public:
+@@ -452,8 +564,8 @@ public:
}
};
@@ -1956,7 +1957,7 @@
class ProgressBarImpl : public ControlImpl
{
-@@ -494,8 +656,8 @@ public:
+@@ -494,8 +606,8 @@ public:
}
};
@@ -1967,7 +1968,7 @@
void FixedImage::setImage( ::Image const& i )
{
-@@ -521,7 +683,7 @@ FixedImage::~FixedImage()
+@@ -521,7 +633,7 @@ FixedImage::~FixedImage()
#endif
@@ -1976,7 +1977,7 @@
#if 0
ProgressBar::ProgressBar( Context *pCtx, const char *pId, sal_uInt32 nId )
: Control( new ProgressBarImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
-@@ -534,7 +696,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
+@@ -534,7 +646,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
}
#endif
@@ -1985,13 +1986,13 @@
void ProgressBar::SetForegroundColor( css::util::Color color )
-@@ -601,7 +763,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
+@@ -601,7 +713,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
{
}
-DECL_GET_IMPL_IMPL( Plugin )
+IMPL_GET_IMPL( Plugin );
-
++
+class LocalizedStringImpl : public WindowImpl
+{
+public:
@@ -2025,7 +2026,7 @@
+{
+ return getImpl().getText();
+}
-+
+
+String LocalizedString::operator= (String const& s)
+{
+ getImpl().setText( s );
@@ -2149,7 +2150,7 @@
struct WidgetSpec {
const char *pLabel, *pName, *pIconName;
diff --git a/workben/layout/makefile.mk b/workben/layout/makefile.mk
-index 7126deb..2b2609c 100644
+index 7126deb..ad535ee 100644
--- toolkit/workben/layout/makefile.mk
+++ toolkit/workben/layout/makefile.mk
@@ -47,7 +47,7 @@ ENABLE_EXCEPTIONS=TRUE
@@ -2178,19 +2179,21 @@
wordcount.xml\
zoom.xml\
-@@ -128,6 +131,12 @@ dist .PHONY :
- touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
+@@ -129,6 +132,14 @@ dist .PHONY :
# FIXME: broken setup
ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx
+
++dist-sort .PHONY :
+ $(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
+ $(SHELL) ./un-test.sh tpsort.hxx > ../$(PRJ)/sc/source/ui/inc/tpsort.hxx
+ $(SHELL) ./un-test.sh sortdlg.cxx > ../$(PRJ)/sc/source/ui/dbgui/sortdlg.cxx
+ $(SHELL) ./un-test.sh sortdlg.hxx > ../$(PRJ)/sc/source/ui/inc/sortdlg.hxx
+ touch ../$(PRJ)/sc/source/ui/attrdlg/scdlgfact.cxx
+ touch ../$(PRJ)/sc/source/ui/view/cellsh2.cxx
-
++
.ELSE # ENABLE_LAYOUT != TRUE
all .PHONY:
+ .ENDIF # ENABLE_LAYOUT != TRUE
diff --git a/workben/layout/refresh b/workben/layout/refresh
index de2652c..7969995 100644
--- toolkit/workben/layout/refresh
@@ -2206,7 +2209,7 @@
+ && ../../${INPATH}/bin/test "$@"
diff --git a/workben/layout/sort-options.xml b/workben/layout/sort-options.xml
new file mode 100644
-index 0000000..bf4dc70
+index 0000000..50184c1
--- /dev/null
+++ toolkit/workben/layout/sort-options.xml
@@ -0,0 +1,36 @@
@@ -2219,7 +2222,7 @@
+ <vbox spacing="4" border="5">
+ <string id="STR_COL_LABEL" _text="Range contains column la~bels"/>
+ <string id="STR_ROW_LABEL" _text="Range contains ~row labels"/>
-+ <string id="XSCSTR_UNDEFINED" _text="- undefined -"/>
++ <string id="SCSTR_UNDEFINED" _text="- undefined -"/>
+ <vbox spacing="4" border="5">
+ <checkbox id="BTN_CASESENSITIVE" tabstop="true" _label="Case ~sensitive"/>
+ <checkbox id="BTN_LABEL" tabstop="true"/>
@@ -2237,10 +2240,10 @@
+ <fixedtext id="FT_ALGORITHM" _label="O~ptions"/>
+ </hbox>
+ <hbox>
-+ <listbox has_border="true" dropdown="true" id="LB_LANGUAGE" sort="true" tabstop="true" string-item-list="Default"/>
++ <listbox has_border="true" dropdown="true" id="LB_LANGUAGE" sort="true" tabstop="true" _string-item-list="Default"/>
+ <listbox has_border="true" dropdown="true" id="LB_ALGORITHM" tabstop="true"/>
+ </hbox>
-+ <fixedline id="FL_DIRECTION" text="Direction"/>
++ <fixedline id="FL_DIRECTION" _text="Direction"/>
+ <radiobutton id="BTN_TOP_DOWN" tabstop="true" _label="~Top to bottom (sort rows)"/>
+ <radiobutton id="BTN_LEFT_RIGHT" tabstop="true" _label="L~eft to right (sort columns)"/>
+ </vbox>
@@ -2248,42 +2251,37 @@
+</tabpage>
diff --git a/workben/layout/sortdlg.cxx b/workben/layout/sortdlg.cxx
new file mode 100644
-index 0000000..7d91042
+index 0000000..90b89fa
--- /dev/null
+++ toolkit/workben/layout/sortdlg.cxx
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: sortdlg.cxx,v $
-+ *
-+ * $Revision: 1.5 $
-+ *
-+ * last change: $Author: kz $ $Date: 2006/07/21 13:29:10 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: sortdlg.cxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
@@ -2426,51 +2424,44 @@
+
diff --git a/workben/layout/sortdlg.hxx b/workben/layout/sortdlg.hxx
new file mode 100644
-index 0000000..8c4459e
+index 0000000..d2ea7ed
--- /dev/null
+++ toolkit/workben/layout/sortdlg.hxx
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: sortdlg.hxx,v $
-+ *
-+ * $Revision: 1.2 $
-+ *
-+ * last change: $Author: rt $ $Date: 2005/09/08 21:51:47 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: sortdlg.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_SORTDLG_HXX
+#define SC_SORTDLG_HXX
+
-+#ifndef _SFXTABDLG_HXX //autogen
+#include <sfx2/tabdlg.hxx>
-+#endif
+
+#ifndef _SFX_HXX
+#endif
@@ -3029,42 +3020,37 @@
UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
diff --git a/workben/layout/tpsort.cxx b/workben/layout/tpsort.cxx
new file mode 100644
-index 0000000..94c9975
+index 0000000..73aa236
--- /dev/null
+++ toolkit/workben/layout/tpsort.cxx
-@@ -0,0 +1,1121 @@
+@@ -0,0 +1,1111 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: tpsort.cxx,v $
-+ *
-+ * $Revision: 1.12 $
-+ *
-+ * last change: $Author: vg $ $Date: 2007/02/27 13:05:23 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tpsort.cxx,v $
++ * $Revision: 1.13 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
@@ -3160,6 +3146,7 @@
+ aLbSort3 ( this, ScResId( LB_SORT3 ) ),
+ aBtnUp3 ( this, ScResId( BTN_UP3 ) ),
+ aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ),
++
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aStrRow ( ScResId( SCSTR_ROW ) ),
@@ -3178,7 +3165,6 @@
+#else /* TEST_LAYOUT */
+ rSortData ( *new ScSortParam() ),
+#endif /* TEST_LAYOUT */
-+
+ nFieldCount ( 0 ),
+ bHasHeader ( FALSE ),
+ bSortByRows ( FALSE )
@@ -3581,7 +3567,6 @@
+ EnableField( 3 );
+ }
+ }
-+
+ return 0;
+}
+
@@ -3711,10 +3696,9 @@
+ String theDbName = aStrNoName;
+ const SCTAB nCurTab = pViewData->GetTabNo();
+ const ScAddress::Convention eConv = pDoc->GetAddressConvention();
++#endif /* !TEST_LAYOUT */
++
+ aLbOutPos.Clear();
-+#else /* TEST_LAYOUT */
-+ aStrUndefined = rtl::OUString::createFromAscii( "- undefined -" );
-+#endif /* TEST_LAYOUT */
+ aLbOutPos.InsertEntry( aStrUndefined, 0 );
+ aLbOutPos.Disable();
+
@@ -3745,6 +3729,7 @@
+ ScRange( aScAddress,
+ ScAddress( rSortData.nCol2, rSortData.nRow2, nCurTab )
+ ).Format( theArea, SCR_ABS, pDoc, eConv );
++
+ if ( pDBColl )
+ {
+ ScDBData* pDBData
@@ -3836,7 +3821,6 @@
+ eLang = LANGUAGE_SYSTEM;
+ aLbLanguage.SelectLanguage( eLang );
+ FillAlgorHdl( &aLbLanguage ); // get algorithms, select default
-+
+ if ( rSortData.aCollatorAlgorithm.Len() )
+ aLbAlgorithm.SelectEntry( pColRes->GetTranslation( rSortData.aCollatorAlgorithm ) );
+
@@ -4003,7 +3987,6 @@
+
+void ScTabPageSortOptions::FillUserSortListBox()
+{
-+
+ ScUserList* pUserLists = ScGlobal::GetUserList();
+
+ aLbSortUser.Clear();
@@ -4079,7 +4062,6 @@
+ {
+ aBtnHeader.SetText( aStrRowLabel );
+ }
-+
+ return 0;
+}
+
@@ -4149,49 +4131,43 @@
+ }
+
+ aLbAlgorithm.SetUpdateMode( TRUE );
-+
+ return 0;
+}
+
+
diff --git a/workben/layout/tpsort.hxx b/workben/layout/tpsort.hxx
new file mode 100644
-index 0000000..39a12cb
+index 0000000..8673ab6
--- /dev/null
+++ toolkit/workben/layout/tpsort.hxx
-@@ -0,0 +1,247 @@
+@@ -0,0 +1,222 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: tpsort.hxx,v $
-+ *
-+ * $Revision: 1.7.248.1 $
-+ *
-+ * last change: $Author: kz $ $Date: 2008/01/18 11:56:00 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tpsort.hxx,v $
++ * $Revision: 1.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
@@ -4199,37 +4175,17 @@
+#define SC_TPSORT_HXX
+
+
-+#ifndef _SFXTABDLG_HXX //autogen
+#include <sfx2/tabdlg.hxx>
-+#endif
-+
-+#ifndef _SV_EDIT_HXX //autogen
+#include <vcl/edit.hxx>
-+#endif
-+
-+#ifndef _SV_FIXED_HXX //autogen
+#include <vcl/fixed.hxx>
-+#endif
-+
-+#ifndef _SV_LSTBOX_HXX //autogen
+#include <vcl/lstbox.hxx>
-+#endif
-+
-+#ifndef _STDCTRL_HXX //autogen
+#include <svtools/stdctrl.hxx>
-+#endif
-+
-+#ifndef _SVX_LANGBOX_HXX
+#include <svx/langbox.hxx>
-+#endif
+
-+#ifndef SC_SCGLOB_HXX
-+#include "global.hxx"
-+#endif
+
-+#ifndef SC_ADDRESS_HXX
++#include "global.hxx"
+#include "address.hxx"
-+#endif
++
+//------------------------------------------------------------------------
+
+// +1 because one field is reserved for the "- undefined -" entry
@@ -4350,7 +4306,7 @@
+ CheckBox aBtnFormats;
+ CheckBox aBtnCopyResult;
+
-+ CheckBox aBtnNaturalSort;
++ CheckBox aBtnNaturalSort;
+ ListBox aLbOutPos;
+ Edit aEdOutPos;
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
