From 3213bcb8cad83eebf88e64df0b99150f8b8b2f83 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 26 Jul 2011 16:03:09 +0100 Subject: remove obsolete layout patches --- patches/dev300/apply | 39 ---- patches/dev300/build-fix-layout-numfmt.diff | 22 -- patches/dev300/buildfix-svx-uiconfig-layout.diff | 20 -- patches/dev300/buildfix-sw-uiconfig-layout.diff | 20 -- .../dev300/buildfix-toolkit-workben-layout.diff | 49 ----- .../layout-accessibility-dispose-only-once.diff | 78 -------- patches/dev300/layout-crash-fix.diff | 20 -- .../layout-default-enable-config_office.diff | 26 --- patches/dev300/layout-disable-experimental.diff | 53 ----- .../dev300/layout-disabled-layout-build-fix.diff | 27 --- patches/dev300/layout-fix-experimental-layout.diff | 173 ---------------- patches/dev300/layout-generate-localize-sdf-2.diff | 34 ---- patches/dev300/layout-generate-localize-sdf.diff | 150 -------------- patches/dev300/layout-listbox-minsize.diff | 19 -- patches/dev300/layout-localize-fix-sc.diff | 21 -- patches/dev300/layout-move-copy-fixed-height.diff | 20 -- patches/dev300/layout-parallel-build.diff | 54 ----- ...post-cws-layoutdialogs2-edit-noop-reversal.diff | 29 --- ...st-cws-layoutdialogs2-mysteriously-missing.diff | 221 --------------------- patches/dev300/speed-build-transex.diff | 162 --------------- 20 files changed, 1237 deletions(-) delete mode 100644 patches/dev300/build-fix-layout-numfmt.diff delete mode 100644 patches/dev300/buildfix-svx-uiconfig-layout.diff delete mode 100644 patches/dev300/buildfix-sw-uiconfig-layout.diff delete mode 100644 patches/dev300/buildfix-toolkit-workben-layout.diff delete mode 100644 patches/dev300/layout-accessibility-dispose-only-once.diff delete mode 100644 patches/dev300/layout-crash-fix.diff delete mode 100644 patches/dev300/layout-default-enable-config_office.diff delete mode 100644 patches/dev300/layout-disable-experimental.diff delete mode 100644 patches/dev300/layout-disabled-layout-build-fix.diff delete mode 100644 patches/dev300/layout-fix-experimental-layout.diff delete mode 100644 patches/dev300/layout-generate-localize-sdf-2.diff delete mode 100644 patches/dev300/layout-generate-localize-sdf.diff delete mode 100644 patches/dev300/layout-listbox-minsize.diff delete mode 100644 patches/dev300/layout-localize-fix-sc.diff delete mode 100644 patches/dev300/layout-move-copy-fixed-height.diff delete mode 100644 patches/dev300/layout-parallel-build.diff delete mode 100644 patches/dev300/layout-post-cws-layoutdialogs2-edit-noop-reversal.diff delete mode 100644 patches/dev300/layout-post-cws-layoutdialogs2-mysteriously-missing.diff delete mode 100644 patches/dev300/speed-build-transex.diff diff --git a/patches/dev300/apply b/patches/dev300/apply index 79cfd9f2a..49d76ee03 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -29,8 +29,6 @@ Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes NLPSolver : NLPSolverBits #Localize Localize : LocalizeFixes -# unused but present -Unused: LayoutDialogs # Novell NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix @@ -1229,43 +1227,6 @@ sw-mailmerge-faster.diff, i#40827, mloiseleur # hyperlink issue with numeric slide names in Impress sd-update-relative-links.diff, n#355674, i#55224, rodo -[ LayoutDialogs ] -# convert some simple dialogs to layout engine - -# FIXME: these bits are part of layoutdialogs2 -- some things got -# removed upstream, apparently. -layout-post-cws-layoutdialogs2-mysteriously-missing.diff -layout-post-cws-layoutdialogs2-edit-noop-reversal.diff, n#552450 - -layout-localize-fix-sc.diff - -# Enable layout'ed dialogs. -# FIXME: do not enable the layout dialogs by default; there are still problems with them (resizing, look, ...) -#layout-default-enable-config_office.diff, janneke -#layout-disable-experimental.diff -layout-accessibility-dispose-only-once.diff, n#500267, janneke -buildfix-toolkit-workben-layout.diff -buildfix-svx-uiconfig-layout.diff -buildfix-sw-uiconfig-layout.diff -build-fix-layout-numfmt.diff -# Fix heavy parallel build of the zips containing the xmls -layout-parallel-build.diff -layout-fix-experimental-layout.diff, n#557230, thorsten -layout-crash-fix.diff, n#557230, thorsten -layout-listbox-minsize.diff, n#557230, thorsten -layout-move-copy-fixed-height.diff, n#559438, thorsten -# FIXME: temporary hack to build with layout disabled -# is there a better fix? -layout-disabled-layout-build-fix.diff, pmladek - -# really localize the layout dialogs -# FIXME: generates localize.sdf from the .zip files in solver -# should replace layout-localize-fix-sc.diff -layout-generate-localize-sdf.diff, deb#570378, pmladek -# zoom dialog was not localized -layout-generate-localize-sdf-2.diff, bnc#595823, pmladek - - [ OxygenOfficePalettes ] palette-enhanced-arrow.diff ## palette-enhanced-color.diff diff --git a/patches/dev300/build-fix-layout-numfmt.diff b/patches/dev300/build-fix-layout-numfmt.diff deleted file mode 100644 index a0b1949e3..000000000 --- a/patches/dev300/build-fix-layout-numfmt.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- - cui/source/tabpages/numfmt.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git cui/source/tabpages/numfmt.cxx cui/source/tabpages/numfmt.cxx -index 794d41f..c58c45c 100644 ---- cui/source/tabpages/numfmt.cxx -+++ cui/source/tabpages/numfmt.cxx -@@ -25,8 +25,8 @@ - * - ************************************************************************/ - --#if !ENABLE_LAYOUT_EXPERIMENTAL --//#undef ENABLE_LAYOUT -+#if !ENABLE_LAYOUT_EXPERIMENTAL && defined (ENABLE_LAYOUT) -+#undef ENABLE_LAYOUT - #endif - - // MARKER(update_precomp.py): autogen include statement, do not remove --- -1.7.0.1 - diff --git a/patches/dev300/buildfix-svx-uiconfig-layout.diff b/patches/dev300/buildfix-svx-uiconfig-layout.diff deleted file mode 100644 index e0d955456..000000000 --- a/patches/dev300/buildfix-svx-uiconfig-layout.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- - svx/uiconfig/layout/layout.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git svx/uiconfig/layout/layout.mk svx/uiconfig/layout/layout.mk -index f6bea87..a79ae67 100644 ---- svx/uiconfig/layout/layout.mk -+++ svx/uiconfig/layout/layout.mk -@@ -1,7 +1,7 @@ - # TODO: move to solenv/inc - # copies: sw/uiconfig/layout svx/uiconfig/layout - --TRALAY=tralay -+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay - XML_DEST=$(DLLDEST) - XML_LANGS=$(alllangiso) - --- -1.7.0.1 - diff --git a/patches/dev300/buildfix-sw-uiconfig-layout.diff b/patches/dev300/buildfix-sw-uiconfig-layout.diff deleted file mode 100644 index 8e74f35d1..000000000 --- a/patches/dev300/buildfix-sw-uiconfig-layout.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- - sw/uiconfig/layout/layout.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git sw/uiconfig/layout/layout.mk sw/uiconfig/layout/layout.mk -index f6bea87..a79ae67 100644 ---- sw/uiconfig/layout/layout.mk -+++ sw/uiconfig/layout/layout.mk -@@ -1,7 +1,7 @@ - # TODO: move to solenv/inc - # copies: sw/uiconfig/layout svx/uiconfig/layout - --TRALAY=tralay -+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay - XML_DEST=$(DLLDEST) - XML_LANGS=$(alllangiso) - --- -1.7.0.1 - diff --git a/patches/dev300/buildfix-toolkit-workben-layout.diff b/patches/dev300/buildfix-toolkit-workben-layout.diff deleted file mode 100644 index fdf807408..000000000 --- a/patches/dev300/buildfix-toolkit-workben-layout.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- - toolkit/workben/layout/TEST | 2 +- - toolkit/workben/layout/test.cxx | 5 +++++ - toolkit/workben/layout/tpsort.cxx | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git toolkit/workben/layout/TEST toolkit/workben/layout/TEST -index 8a04a66..0eb0a94 100755 ---- toolkit/workben/layout/TEST -+++ toolkit/workben/layout/TEST -@@ -1,5 +1,5 @@ - #! /bin/sh --for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do -+for d in $(cd ../../../../.. && pwd)/ooo-git /usr/lib/ooo3/; do - if test -d $d; then - export OOO_INSTALL_PREFIX=$d - break -diff --git toolkit/workben/layout/test.cxx toolkit/workben/layout/test.cxx -index 36a18d6..f911e4a 100644 ---- toolkit/workben/layout/test.cxx -+++ toolkit/workben/layout/test.cxx -@@ -199,6 +199,11 @@ void LayoutTest::ParseCommandLine() - OUString aParam = OUString( GetCommandLineParam( i ) ); - if ( aParam.equalsAscii( "-h" ) || aParam.equalsAscii( "--help" ) ) - usage(); -+ if ( aParam.equalsAscii( "--oustring-cstr")) -+ exit (printf ("%s: The strings: %s and %s.\n", -+ __PRETTY_FUNCTION__, -+ OUSTRING_CSTR (OUString::createFromAscii ("foo")), -+ OUSTRING_CSTR (OUString::createFromAscii ("bar")))); - if ( aParam.equalsAscii( "--inst" ) ) - { - if ( i >= GetCommandLineParamCount() - 1) -diff --git toolkit/workben/layout/tpsort.cxx toolkit/workben/layout/tpsort.cxx -index 9f0684d..884cbf1 100644 ---- toolkit/workben/layout/tpsort.cxx -+++ toolkit/workben/layout/tpsort.cxx -@@ -442,7 +442,7 @@ void ScTabPageSortFields::FillFieldLists() - { - aFieldName = aStrColumn; - aFieldName += ' '; -- aFieldName += ColToAlpha( col ); -+ aFieldName += ScColToAlpha( col ); - } - nFieldArr[i] = col; - aLbSort1.InsertEntry( aFieldName, i ); --- -1.7.0.1 - diff --git a/patches/dev300/layout-accessibility-dispose-only-once.diff b/patches/dev300/layout-accessibility-dispose-only-once.diff deleted file mode 100644 index 2175504ae..000000000 --- a/patches/dev300/layout-accessibility-dispose-only-once.diff +++ /dev/null @@ -1,78 +0,0 @@ ---- - toolkit/source/layout/vcl/wfield.cxx | 4 ++++ - toolkit/source/layout/vcl/wrapper.cxx | 13 ++++++------- - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git toolkit/source/layout/vcl/wfield.cxx toolkit/source/layout/vcl/wfield.cxx -index 7f16769..bf89d60 100644 ---- toolkit/source/layout/vcl/wfield.cxx -+++ toolkit/source/layout/vcl/wfield.cxx -@@ -419,6 +419,8 @@ ComboBox::~ComboBox () - #ifndef __SUNPRO_CC - OSL_TRACE ("%s: deleting ComboBox for window: %p", __FUNCTION__, GetWindow ()); - #endif -+ SetClickHdl (Link ()); -+ SetSelectHdl (Link ()); - } - - ComboBoxImpl::~ComboBoxImpl () -@@ -668,6 +670,8 @@ public: - - ListBox::~ListBox () - { -+ SetClickHdl (Link ()); -+ SetSelectHdl (Link ()); - } - - sal_uInt16 ListBox::InsertEntry (String const& rStr, sal_uInt16 nPos) -diff --git toolkit/source/layout/vcl/wrapper.cxx toolkit/source/layout/vcl/wrapper.cxx -index 9c69662..d377970 100644 ---- toolkit/source/layout/vcl/wrapper.cxx -+++ toolkit/source/layout/vcl/wrapper.cxx -@@ -174,7 +174,10 @@ WindowImpl::WindowImpl (Context *context, const PeerHandle &peer, Window *window - WindowImpl::~WindowImpl () - { - if (mpWindow) -+ { -+ mpWindow->GetWindow ()->SetAccessible (0); - mpWindow->mpImpl = 0; -+ } - if (mvclWindow) - { - VCLXWindow *v = mvclWindow->GetWindowPeer (); -@@ -696,10 +699,6 @@ ControlImpl::ControlImpl (Context *context, const PeerHandle &peer, Window *wind - - ControlImpl::~ControlImpl () - { -- if ((!!mGetFocusHdl || !!mLoseFocusHdl) && mxWindow.is ()) -- /* Disposing will be done @ VCLXWindow::dispose () maFocusListeners.disposeAndClear() -- don't do it twice */ -- mxWindow.clear (); - } - - void ControlImpl::SetGetFocusHdl (Link const& link) -@@ -723,7 +722,7 @@ void ControlImpl::SetLoseFocusHdl (Link const& link) - - Link& ControlImpl::GetLoseFocusHdl () - { -- return mGetFocusHdl; -+ return mLoseFocusHdl; - } - - void ControlImpl::UpdateListening (Link const& link) -@@ -735,10 +734,10 @@ void ControlImpl::UpdateListening (Link const& link) - mxWindow->addFocusListener (this); - } - --void SAL_CALL ControlImpl::disposing (lang::EventObject const&) -+void SAL_CALL ControlImpl::disposing (lang::EventObject const& e) - throw (uno::RuntimeException) - { --/// mxWindow.clear (); -+ WindowImpl::disposing (e); - } - - void SAL_CALL ControlImpl::focusGained (awt::FocusEvent const&) --- -1.7.0.1 - diff --git a/patches/dev300/layout-crash-fix.diff b/patches/dev300/layout-crash-fix.diff deleted file mode 100644 index 44e86daf6..000000000 --- a/patches/dev300/layout-crash-fix.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- - toolkit/inc/layout/layout.hxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git toolkit/inc/layout/layout.hxx toolkit/inc/layout/layout.hxx -index d0e0b2e..a9cd3bb 100644 ---- toolkit/inc/layout/layout.hxx -+++ toolkit/inc/layout/layout.hxx -@@ -110,7 +110,7 @@ public: - inline t##Impl &getImpl() const - - #define DECL_GET_WINDOW( cls ) ::cls* Get##cls() const --#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return dynamic_cast< ::cls*>( GetWindow() ); } -+#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return static_cast< ::cls*>( GetWindow() ); } - - #define DECL_GET_VCLXWINDOW( cls ) ::VCLX##cls* GetVCLX##cls() const - #define IMPL_GET_VCLXWINDOW( cls ) ::VCLX##cls* cls::Get##VCLX##cls() const { return dynamic_cast< ::VCLX##cls*>( GetVCLXWindow() ); } --- -1.7.0.1 - diff --git a/patches/dev300/layout-default-enable-config_office.diff b/patches/dev300/layout-default-enable-config_office.diff deleted file mode 100644 index 27c86bd29..000000000 --- a/patches/dev300/layout-default-enable-config_office.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- - configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git configure.in configure.in -index 1cc6fbd..6017fc9 100644 ---- configure.in -+++ configure.in -@@ -235,7 +235,7 @@ AC_ARG_ENABLE(static-gtk, - ],,) - - AC_ARG_ENABLE(layout, --[ --enable-layout Enable the compilation and use of layout dialogs -+[ --disable-layout Disable the compilation and use of layout dialogs - ],,) - - AC_ARG_ENABLE(build-mozilla, -@@ -7134,7 +7134,7 @@ fi - AC_SUBST(ENABLE_STATIC_GTK) - - AC_MSG_CHECKING([whether to use layout dialogs]) --if test -n "$enable_layout" && test "$enable_layout" != "no"; then -+if test -z "$enable_layout" || test "$enable_layout" != "no"; then - ENABLE_LAYOUT="TRUE" - AC_MSG_RESULT([yes]) - else diff --git a/patches/dev300/layout-disable-experimental.diff b/patches/dev300/layout-disable-experimental.diff deleted file mode 100644 index 4fa22cfe4..000000000 --- a/patches/dev300/layout-disable-experimental.diff +++ /dev/null @@ -1,53 +0,0 @@ ---- - configure.in | 14 ++++++++++++++ - set_soenv.in | 1 + - 2 files changed, 15 insertions(+), 0 deletions(-) - -diff --git configure.in configure.in -index 6017fc9..6bcf3f0 100644 ---- configure.in -+++ configure.in -@@ -237,6 +237,11 @@ AC_ARG_ENABLE(static-gtk, - [ --disable-layout Disable the compilation and use of layout dialogs - ],,) - -+AC_ARG_ENABLE(layout_experimental, -+[ --enable-layout-experimental Enable the compilation and use of layout dialogs -+ tagged experimental. -+],,) -+ - AC_ARG_ENABLE(build-mozilla, - [ --disable-build-mozilla Use this option if you do not want to build the - mozilla components from the mozilla source code but -@@ -7143,6 +7147,16 @@ else - fi - AC_SUBST(ENABLE_LAYOUT) - -+AC_MSG_CHECKING([whether to use experimental layout dialogs]) -+if test -n "$enable_layout_experimental" && test "$enable_layout_experimental" == "yes"; then -+ ENABLE_LAYOUT_EXPERIMENTAL="TRUE" -+ AC_MSG_RESULT([yes]) -+else -+ ENABLE_LAYOUT_EXPERIMENTAL="FALSE" -+ AC_MSG_RESULT([no]) -+fi -+AC_SUBST(ENABLE_LAYOUT_EXPERIMENTAL) -+ - # =================================================================== - # De- or increase default verbosity of build process - # =================================================================== -diff --git set_soenv.in set_soenv.in -index 223acb2..6790259 100644 ---- set_soenv.in -+++ set_soenv.in -@@ -1803,6 +1803,7 @@ ToFile( "ENABLE_RANDR", "@ENABLE_RANDR@", "e" ); - ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" ); - ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); - ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); -+ToFile( "ENABLE_LAYOUT_EXPERIMENTAL", "@ENABLE_LAYOUT_EXPERIMENTAL@", "e" ); - ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); - ToFile( "NO_HIDS", "@NO_HIDS@", "e" ); - ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e"); --- -1.7.0.1 - diff --git a/patches/dev300/layout-disabled-layout-build-fix.diff b/patches/dev300/layout-disabled-layout-build-fix.diff deleted file mode 100644 index b65ccde7c..000000000 --- a/patches/dev300/layout-disabled-layout-build-fix.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- - sfx2/inc/sfx2/layout.hxx | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git sfx2/inc/sfx2/layout.hxx sfx2/inc/sfx2/layout.hxx -index 836a762..b4e145c 100644 ---- sfx2/inc/sfx2/layout.hxx -+++ sfx2/inc/sfx2/layout.hxx -@@ -49,6 +49,7 @@ - SfxDialog (::Window* parent, char const* xml_file, char const* id, SfxBindings* bindings=0, SfxChildWindow* child=0); - }; - -+#if ENABLE_LAYOUT - class SFX2_DLLPUBLIC SfxTabPage - : public ::SfxTabPage - , public InPlug -@@ -61,6 +62,7 @@ - Size GetOptimalSize (WindowSizeType eType) const; - void FreeResource (); - }; -+#endif - } // end namespace layout - - #endif /* _SFX2_LAYOUT_HXX */ --- -1.7.0.1 - diff --git a/patches/dev300/layout-fix-experimental-layout.diff b/patches/dev300/layout-fix-experimental-layout.diff deleted file mode 100644 index af7e2493f..000000000 --- a/patches/dev300/layout-fix-experimental-layout.diff +++ /dev/null @@ -1,173 +0,0 @@ ---- - cui/source/inc/numfmt.hxx | 6 ++++++ - cui/source/tabpages/numfmt.cxx | 20 ++++++++------------ - sc/source/ui/attrdlg/scdlgfact.cxx | 8 ++------ - sc/source/ui/attrdlg/scdlgfact.hxx | 5 +++-- - 4 files changed, 19 insertions(+), 20 deletions(-) - -diff --git cui/source/inc/numfmt.hxx cui/source/inc/numfmt.hxx -index b5638c5..98b49d5 100644 ---- cui/source/inc/numfmt.hxx -+++ cui/source/inc/numfmt.hxx -@@ -77,8 +77,12 @@ public: - - // ----------------------------------------------------------------------- - -+#if ENABLE_LAYOUT_EXPERIMENTAL - #include - #include -+#else -+#define LocalizedString String -+#endif /* !ENABLE_LAYOUT_EXPERIMENTAL */ - - class SvxNumberFormatTabPage : public SfxTabPage - { -@@ -182,7 +186,9 @@ private: - #endif - }; - -+#if ENABLE_LAYOUT_EXPERIMENTAL - #include -+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */ - - #endif - -diff --git cui/source/tabpages/numfmt.cxx cui/source/tabpages/numfmt.cxx -index c58c45c..87047e8 100644 ---- cui/source/tabpages/numfmt.cxx -+++ cui/source/tabpages/numfmt.cxx -@@ -25,10 +25,6 @@ - * - ************************************************************************/ - --#if !ENABLE_LAYOUT_EXPERIMENTAL && defined (ENABLE_LAYOUT) --#undef ENABLE_LAYOUT --#endif -- - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_cui.hxx" - -@@ -233,19 +229,19 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) - - #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl ) - -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - #include - --#if ENABLE_LAYOUT - #undef CUI_RES - #define CUI_RES(x) #x - #define CUI_RES_PLAIN(x) ResId (x, CUI_MGR ()) - #define THIS_CUI_RES(x) this, #x - #undef SfxTabPage - #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "number-format.xml", id, &args ) --#else /* !ENABLE_LAYOUT */ -+#else /* ! ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT */ - #define CUI_RES_PLAIN CUI_RES - #define THIS_CUI_RES CUI_RES --#endif /* !ENABLE_LAYOUT */ -+#endif /* ! ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT */ - - SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, - const SfxItemSet& rCoreAttrs ) -@@ -276,7 +272,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, - aFtComment ( this, CUI_RES( FT_COMMENT ) ), - aEdComment ( this, CUI_RES( ED_COMMENT ) ), - --#if ENABLE_LAYOUT -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - aWndPreview ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ), - #else - aWndPreview ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ), -@@ -288,7 +284,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, - sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)), - pLastActivWindow( NULL ) - { --#if ENABLE_LAYOUT -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - aLbFormat.Clear (); - #endif /* ENABLE_LAYOUT */ - -@@ -1166,7 +1162,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl - aPos.Y()=nStdFormatY; - aSize.Height()=nStdFormatHeight; - aLbFormat.SetPosSizePixel(aPos,aSize); --#if ENABLE_LAYOUT -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - aLbCurrency.Disable(); - #else /* !ENABLE_LAYOUT */ - aLbCurrency.Hide(); -@@ -1177,7 +1173,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl - aPos.Y()=nCurFormatY; - aSize.Height()=nCurFormatHeight; - aLbFormat.SetPosSizePixel(aPos,aSize); --#if ENABLE_LAYOUT -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - aLbCurrency.Enable(); - #else /* !ENABLE_LAYOUT */ - aLbCurrency.Show(); -@@ -1315,7 +1311,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) - - // Reinit options enable/disable for current selection. - --#if ENABLE_LAYOUT -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - if (aLbFormat.GetSelectEntryPos () == LISTBOX_ENTRY_NOTFOUND) - #else /* !ENABLE_LAYOUT */ - // Current category may be UserDefined with no format entries defined. -diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx -index 3d261aa..46da823 100644 ---- sc/source/ui/attrdlg/scdlgfact.cxx -+++ sc/source/ui/attrdlg/scdlgfact.cxx -@@ -28,10 +28,6 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_sc.hxx" - --#if ! ENABLE_LAYOUT_EXPERIMENTAL --#undef ENABLE_LAYOUT --#endif -- - #undef SC_DLLIMPLEMENTATION - - #include "scdlgfact.hxx" -@@ -149,7 +145,7 @@ String AbstractTabDialog_Impl::GetText() const - return pDlg->GetText(); - } - --#if ENABLE_LAYOUT -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - namespace layout - { - IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg -@@ -184,7 +180,7 @@ String AbstractTabDialog_Impl::GetText() const - return pDlg->GetText(); - } - } --#endif /* ENABLE_LAYOUT */ -+#endif /* ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT */ - - //add for AbstractTabDialog_Impl end - // AbstractScImportAsciiDlg_Impl begin -diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx -index d8ae113..f811170 100644 ---- sc/source/ui/attrdlg/scdlgfact.hxx -+++ sc/source/ui/attrdlg/scdlgfact.hxx -@@ -368,7 +368,8 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; - }; --#if ENABLE_LAYOUT -+ -+#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT - namespace layout - { - //add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg -@@ -384,7 +385,7 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog - virtual String GetText() const; - }; - } // end namespace layout --#endif /* ENABLE_LAYOUT */ -+#endif /* ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT */ - //------------------------------------------------------------------------ - //AbstractDialogFactory_Impl implementations - class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory diff --git a/patches/dev300/layout-generate-localize-sdf-2.diff b/patches/dev300/layout-generate-localize-sdf-2.diff deleted file mode 100644 index 6e767a2c2..000000000 --- a/patches/dev300/layout-generate-localize-sdf-2.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- svx/uiconfig/layout/makefile.mk.old 2010-11-10 20:50:39.000000000 +0100 -+++ svx/uiconfig/layout/makefile.mk 2010-11-23 20:47:22.000000000 +0100 -@@ -47,9 +47,9 @@ all .PHONY: - - .INCLUDE : target.mk - --localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf -+localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf $(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf - grep srchdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/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", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@ -- grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/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", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@ -+ grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/cui$/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", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@ - echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@ - rm -f *-$@ - -@@ -61,10 +61,19 @@ $(COMMONMISC)$/$(PRJNAME)$/source$/dialo - -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) - $(TOUCH) $@ - -+$(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip -+ @@-$(MKDIRHIER) $(@:d) -+ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) -+ $(TOUCH) $@ -+ - .ELSE - - $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf : - @@-$(MKDIRHIER) $(@:d) - $(TOUCH) $@ - -+$(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf : -+ @@-$(MKDIRHIER) $(@:d) -+ $(TOUCH) $@ -+ - .ENDIF # "$(WITH_LANG)"!="" diff --git a/patches/dev300/layout-generate-localize-sdf.diff b/patches/dev300/layout-generate-localize-sdf.diff deleted file mode 100644 index 5b61839b8..000000000 --- a/patches/dev300/layout-generate-localize-sdf.diff +++ /dev/null @@ -1,150 +0,0 @@ ---- - sc/uiconfig/layout/makefile.mk | 35 +++++++++++++++++++++++++++-------- - svx/uiconfig/layout/layout.mk | 28 ++++++++++++---------------- - svx/uiconfig/layout/makefile.mk | 27 +++++++++++++++++++++------ - 3 files changed, 60 insertions(+), 30 deletions(-) - -diff --git sc/uiconfig/layout/makefile.mk sc/uiconfig/layout/makefile.mk -index 0b19c02..c02d34e 100644 ---- sc/uiconfig/layout/makefile.mk -+++ sc/uiconfig/layout/makefile.mk -@@ -51,15 +51,34 @@ all .PHONY: - - .INCLUDE : target.mk - --localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/localize.sdf -- grep instbdlg.src $(PRJ)/source/ui/miscdlgs/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", "sc\\uiconfig\\layout\\insert-sheet.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_INSERT_TABLE/\t/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@ -- grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(PRJ)/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", "sc\\uiconfig\\layout\\move-copy-sheet.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_MOVETAB/\t/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/'> move-copy-sheet-$@ -- grep sortdlg.src $(PRJ)/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", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@ -+localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/localize.sdf $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/localize.sdf -+ grep instbdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/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", "sc\\uiconfig\\layout\\insert-sheet.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_INSERT_TABLE/\t/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@ -+ grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(COMMONMISC)$/$(PRJNAME)$/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", "sc\\uiconfig\\layout\\move-copy-sheet.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_MOVETAB/\t/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/'> move-copy-sheet-$@ -+ grep sortdlg.src $(COMMONMISC)$/$(PRJNAME)$/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", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@ - echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@ - rm -f *-$@ - --$(PRJ)/source/ui/miscdlgs/localize.sdf: -- touch $@ -+.IF "$(WITH_LANG)"!="" - --$(PRJ)/source/ui/src/localize.sdf: -- touch $@ -+# FIXME: do not duplicate the code from target.mk -+$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip -+ @@-$(MKDIRHIER) $(@:d) -+ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) -+ $(TOUCH) $@ -+ -+$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip -+ @@-$(MKDIRHIER) $(@:d) -+ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) -+ $(TOUCH) $@ -+ -+.ELSE -+ -+$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/localize.sdf : -+ @@-$(MKDIRHIER) $(@:d) -+ $(TOUCH) $@ -+ -+$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/localize.sdf : -+ @@-$(MKDIRHIER) $(@:d) -+ $(TOUCH) $@ -+ -+.ENDIF # "$(WITH_LANG)"!="" -diff --git svx/uiconfig/layout/layout.mk svx/uiconfig/layout/layout.mk -index a79ae67..227da15 100644 ---- svx/uiconfig/layout/layout.mk -+++ svx/uiconfig/layout/layout.mk -@@ -1,33 +1,29 @@ --# TODO: move to solenv/inc --# copies: sw/uiconfig/layout svx/uiconfig/layout -- --TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay -+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay - XML_DEST=$(DLLDEST) - XML_LANGS=$(alllangiso) - --ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j)) -+ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)$/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)$/$i$/$j)) -+XML_DEPS=$(foreach,i,$(XML_FILES) $(MISC)$/$i.dep) - - # Must remove the -j (no duplicate base file names) flag - ZIPUPDATE=-u - XML_ZIP = $(PRJNAME)-layout - --ALLTAR: $(XML_ZIP) -+ALLTAR .SEQUENTIAL: localize.sdf ALL_XML_DEPS - --$(XML_ZIP): $(ALL_XMLS) -+ALL_XML_DEPS: $(XML_DEPS) - - ZIP1DIR=$(XML_DEST) - ZIP1TARGET=$(XML_ZIP) - ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@) -+ZIP1DEPS=localize.sdf $(XML_DEPS) - --$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml -- -$(MKDIR) $(@:d) -- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml -- $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $< -- --$(XML_DEST)/%.xml: %.xml -- -$(MKDIR) $(@:d) -- $(COPY) $< $@ -+$(MISC)$/%.xml.dep: %.xml -+ -$(MKDIR) "$(XML_DEST)" -+ cp "$<" "$(XML_DEST)" -+ $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<" -+ $(TOUCH) "$@" - - # Don't want to overwrite filled localize.sdf with empty template - template.sdf: -- $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@ -+ $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@ -diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk -index 944fc39..23e3dcc 100644 ---- svx/uiconfig/layout/makefile.mk -+++ svx/uiconfig/layout/makefile.mk -@@ -36,9 +36,8 @@ TARGET=layout - all: ALLTAR - - XML_FILES=\ -- "find-and-replace.xml"\ -- zoom.xml\ --# -+ find-and-replace.xml\ -+ zoom.xml - - .INCLUDE : layout.mk - -@@ -48,8 +47,24 @@ all .PHONY: - - .INCLUDE : target.mk - --localize.sdf: $(PRJ)/source/dialog/localize.sdf -- grep srchdlg.src $(PRJ)/source/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", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@ -- grep zoom.src $(PRJ)/source/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", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@ -+localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf -+ grep srchdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/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", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@ -+ grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/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", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@ - echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@ - rm -f *-$@ -+ -+.IF "$(WITH_LANG)"!="" -+ -+# FIXME: do not duplicate the code from target.mk -+$(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip -+ @@-$(MKDIRHIER) $(@:d) -+ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) -+ $(TOUCH) $@ -+ -+.ELSE -+ -+$(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf : -+ @@-$(MKDIRHIER) $(@:d) -+ $(TOUCH) $@ -+ -+.ENDIF # "$(WITH_LANG)"!="" --- -1.7.0.1 - diff --git a/patches/dev300/layout-listbox-minsize.diff b/patches/dev300/layout-listbox-minsize.diff deleted file mode 100644 index 3bae7c564..000000000 --- a/patches/dev300/layout-listbox-minsize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- - vcl/source/control/lstbox.cxx | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git vcl/source/control/lstbox.cxx vcl/source/control/lstbox.cxx -index a78ef20..7756d03 100644 ---- vcl/source/control/lstbox.cxx -+++ vcl/source/control/lstbox.cxx -@@ -98,6 +98,7 @@ ListBox::~ListBox() - - void ListBox::ImplInitListBoxData() - { -+ mpImplLB = NULL; - mpFloatWin = NULL; - mpImplWin = NULL; - mpBtn = NULL; --- -1.7.0.1 - diff --git a/patches/dev300/layout-localize-fix-sc.diff b/patches/dev300/layout-localize-fix-sc.diff deleted file mode 100644 index f1ac6dcca..000000000 --- a/patches/dev300/layout-localize-fix-sc.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- - sc/uiconfig/layout/makefile.mk | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git sc/uiconfig/layout/makefile.mk sc/uiconfig/layout/makefile.mk -index 4a6e5ed..0b19c02 100644 ---- sc/uiconfig/layout/makefile.mk -+++ sc/uiconfig/layout/makefile.mk -@@ -57,3 +57,9 @@ localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/locali - grep sortdlg.src $(PRJ)/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", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@ - echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@ - rm -f *-$@ -+ -+$(PRJ)/source/ui/miscdlgs/localize.sdf: -+ touch $@ -+ -+$(PRJ)/source/ui/src/localize.sdf: -+ touch $@ --- -1.7.0.1 - diff --git a/patches/dev300/layout-move-copy-fixed-height.diff b/patches/dev300/layout-move-copy-fixed-height.diff deleted file mode 100644 index 8dd562635..000000000 --- a/patches/dev300/layout-move-copy-fixed-height.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- - sc/uiconfig/layout/move-copy-sheet.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git sc/uiconfig/layout/move-copy-sheet.xml sc/uiconfig/layout/move-copy-sheet.xml -index 3d26db1..9328724 100644 ---- sc/uiconfig/layout/move-copy-sheet.xml -+++ sc/uiconfig/layout/move-copy-sheet.xml -@@ -9,7 +9,7 @@ - - - -- -+ - - - --- -1.7.0.1 - diff --git a/patches/dev300/layout-parallel-build.diff b/patches/dev300/layout-parallel-build.diff deleted file mode 100644 index 3f4334489..000000000 --- a/patches/dev300/layout-parallel-build.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- - solenv/inc/layout.mk | 23 ++++++++++------------- - 1 files changed, 10 insertions(+), 13 deletions(-) - -diff --git solenv/inc/layout.mk solenv/inc/layout.mk -index 0fb4c39..40697e6 100644 ---- solenv/inc/layout.mk -+++ solenv/inc/layout.mk -@@ -1,32 +1,29 @@ --TRALAY=$(AUGMENT_LIBRARY_PATH) tralay -+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay - XML_DEST=$(DLLDEST) - XML_LANGS=$(alllangiso) - --ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j")) -+ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)$/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)$/$i$/$j)) -+XML_DEPS=$(foreach,i,$(XML_FILES) $(MISC)$/$i.dep) - - # Must remove the -j (no duplicate base file names) flag - ZIPUPDATE=-u - XML_ZIP = $(PRJNAME)-layout - --ALLTAR: localize.sdf $(XML_ZIP) -+ALLTAR .SEQUENTIAL: localize.sdf ALL_XML_DEPS - --$(XML_ZIP): $(ALL_XMLS) -+ALL_XML_DEPS: $(XML_DEPS) - - ZIP1DIR=$(XML_DEST) - ZIP1TARGET=$(XML_ZIP) - ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@) -+ZIP1DEPS=localize.sdf $(XML_DEPS) - --$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml -- $(COMMAND_ECHO)-$(MKDIR) $(@:d) -- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml -+$(MISC)$/%.xml.dep: %.xml -+ $(COMMAND_ECHO)-$(MKDIR) "$(XML_DEST)" -+ $(COMMAND_ECHO)cp "$<" "$(XML_DEST)" - $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<" -- --$(XML_DEST)/%.xml: %.xml -- $(COMMAND_ECHO)-$(MKDIR) $(@:d) -- $(COMMAND_ECHO)$(COPY) "$<" "$@" -+ $(COMMAND_ECHO)$(TOUCH) "$@" - - # Don't want to overwrite filled localize.sdf with empty template - template.sdf: - $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@ -- --$(ZIP1LIST): localize.sdf --- -1.7.0.1 - diff --git a/patches/dev300/layout-post-cws-layoutdialogs2-edit-noop-reversal.diff b/patches/dev300/layout-post-cws-layoutdialogs2-edit-noop-reversal.diff deleted file mode 100644 index 6bed9cced..000000000 --- a/patches/dev300/layout-post-cws-layoutdialogs2-edit-noop-reversal.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- - toolkit/source/layout/vcl/wfield.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git toolkit/source/layout/vcl/wfield.cxx toolkit/source/layout/vcl/wfield.cxx -index ac4c3db..7f16769 100644 ---- toolkit/source/layout/vcl/wfield.cxx -+++ toolkit/source/layout/vcl/wfield.cxx -@@ -105,7 +105,7 @@ Edit::~Edit () - void Edit::SetSelection( Selection const& rSelection ) - { - #if LAYOUT_API_CALLS_HANDLER -- if ( !getImpl().mxEdit.is() ) -+ if ( getImpl().mxEdit.is() ) - getImpl().mxEdit->setSelection( awt::Selection( rSelection.Min(), rSelection.Max() ) ); - #else /* !LAYOUT_API_CALLS_HANDLER */ - GetEdit ()->SetSelection (rSelection); -@@ -125,7 +125,7 @@ void Edit::SetText( OUString const& rStr ) - - String Edit::GetText() const - { -- if ( !getImpl().mxEdit.is() ) -+ if ( getImpl().mxEdit.is() ) - return getImpl().mxEdit->getText(); - return OUString(); - } --- -1.7.0.1 - diff --git a/patches/dev300/layout-post-cws-layoutdialogs2-mysteriously-missing.diff b/patches/dev300/layout-post-cws-layoutdialogs2-mysteriously-missing.diff deleted file mode 100644 index 35fc221c0..000000000 --- a/patches/dev300/layout-post-cws-layoutdialogs2-mysteriously-missing.diff +++ /dev/null @@ -1,221 +0,0 @@ ---- - sc/prj/build.lst | 1 + - svx/uiconfig/layout/find-and-replace.xml | 167 ++++++++++++++++++++++++++++++ - svx/uiconfig/layout/makefile.mk | 11 ++- - 3 files changed, 178 insertions(+), 1 deletions(-) - create mode 100644 svx/uiconfig/layout/find-and-replace.xml - -diff --git sc/prj/build.lst sc/prj/build.lst -index afdd953..a95d444 100755 ---- sc/prj/build.lst -+++ sc/prj/build.lst -@@ -1,6 +1,7 @@ - sc sc : filter l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox NULL - sc sc usr1 - all sc_mkout NULL - sc sc\inc nmake - all sc_inc NULL -+sc sc\uiconfig\layout nmake - all sc_layout NULL - sc sc\prj get - all sc_prj NULL - sc sc\res get - all sc_res NULL - sc sc\res\imglst\inputwin get - all sc_resiw NULL -diff --git svx/uiconfig/layout/find-and-replace.xml svx/uiconfig/layout/find-and-replace.xml -new file mode 100644 -index 0000000..f406dfd ---- /dev/null -+++ svx/uiconfig/layout/find-and-replace.xml -@@ -0,0 +1,167 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk -index e75ae5e..944fc39 100644 ---- svx/uiconfig/layout/makefile.mk -+++ svx/uiconfig/layout/makefile.mk -@@ -35,7 +35,10 @@ TARGET=layout - - all: ALLTAR - --XML_FILES=zoom.xml -+XML_FILES=\ -+ "find-and-replace.xml"\ -+ zoom.xml\ -+# - - .INCLUDE : layout.mk - -@@ -44,3 +47,9 @@ all .PHONY: - .ENDIF # ENABLE_LAYOUT != TRUE - - .INCLUDE : target.mk -+ -+localize.sdf: $(PRJ)/source/dialog/localize.sdf -+ grep srchdlg.src $(PRJ)/source/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", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@ -+ grep zoom.src $(PRJ)/source/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", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@ -+ echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@ -+ rm -f *-$@ --- -1.7.0.1 - diff --git a/patches/dev300/speed-build-transex.diff b/patches/dev300/speed-build-transex.diff deleted file mode 100644 index 34cbae0ba..000000000 --- a/patches/dev300/speed-build-transex.diff +++ /dev/null @@ -1,162 +0,0 @@ -diff -u -w -r transex3/inc/export.hxx transex3/inc/export.hxx ---- transex3/inc/export.hxx 2008-04-10 10:26:41.000000000 +0100 -+++ transex3/inc/export.hxx 2008-10-01 14:33:31.000000000 +0100 -@@ -510,7 +510,9 @@ - SvFileStream aErrLog; - ByteStringSet aLanguageSet; - MergeDataHashMap aMap; -- std::vector aLanguages; -+ ByteStringHashMap aLanguageMap; -+ std::vector aLanguageList; -+ ByteStringHashMap aFilenames; - - - public: - ---- transex3/source/merge.cxx 2008-04-10 10:42:45.000000000 +0100 -+++ transex3/source/merge.cxx 2008-10-01 15:33:23.000000000 +0100 -@@ -210,6 +210,7 @@ - ByteString sTEXT; - ByteString sQHTEXT; - ByteString sTITLE; -+ ByteString sHACK("HACK"); - - const ByteString sEmpty(""); - -@@ -218,30 +219,29 @@ - exit( -1 ); - } - while ( !aInputStream.IsEof()) { -+ xub_StrLen nToks; - aInputStream.ReadLine( sLine ); - sLine = sLine.Convert( RTL_TEXTENCODING_MS_1252, aCharSet ); - -- if ( sLine.GetTokenCount( '\t' ) == 15 ) { -+ nToks = sLine.GetTokenCount( '\t' ); -+ if ( nToks == 15 ) { - // Skip all wrong filenames - ByteString filename = sLine.GetToken( 1 , '\t' ); - filename = filename.Copy( filename.SearchCharBackward( "\\" )+1 , filename.Len() ); - - if( sFile.Equals( sEmpty ) || ( !sFile.Equals( sEmpty ) && filename.Equals( sFile ) ) ) - { -- sTYP = sLine.GetToken( 3, '\t' ); -- sGID = sLine.GetToken( 4, '\t' ); -- sLID = sLine.GetToken( 5, '\t' ); -- sPFO = sLine.GetToken( 7, '\t' ); -- sPFO = ByteString("HACK"); -- nLANG = sLine.GetToken( 9, '\t' ); -- -- sTEXT = sLine.GetToken( 10, '\t' ); -- // printf("%s\n",sTEXT.GetBuffer()); -- // Quote( sTEXT ); -- // printf("%s\n",sTEXT.GetBuffer()); -- -- sQHTEXT = sLine.GetToken( 12, '\t' ); -- sTITLE = sLine.GetToken( 13, '\t' ); -+ xub_StrLen rIdx = 0; -+ sTYP = sLine.GetToken( 3, '\t', rIdx ); -+ sGID = sLine.GetToken( 0, '\t', rIdx ); // 4 -+ sLID = sLine.GetToken( 0, '\t', rIdx ); // 5 -+ sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7 -+ sPFO = sHACK; -+ nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9 -+ sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10 -+ -+ sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12 -+ sTITLE = sLine.GetToken( 0, '\t', rIdx ); // 13 - - nLANG.EraseLeadingAndTrailingChars(); - -@@ -250,20 +263,22 @@ - #else - if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){ - #endif -- InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE , filename , bCaseSensitive ); -- if( nLANG.Len() > 0 ){ -- bool bFound = false; -- for( unsigned int x = 0; x < aLanguages.size(); x++ ){ -- if( aLanguages[ x ].Equals( nLANG ) ) -- bFound = true; -- } -+ ByteStringHashMap::const_iterator lit; -+ lit = aLanguageMap.find (nLANG); -+ ByteString aLANG; -+ if (lit == aLanguageMap.end()) { -+ aLANG = nLANG; -+ aLanguageMap.insert( ByteStringHashMap::value_type( aLANG, aLANG ) ); - // Remember read languages for -l all switch -- if( !bFound ) aLanguages.push_back( nLANG ); -- } -+ aLanguageList.push_back( nLANG ); -+ } else -+ aLANG = lit->first; -+ -+ InsertEntry( sTYP, sGID, sLID, sPFO, aLANG, sTEXT, sQHTEXT, sTITLE , filename , bCaseSensitive ); - } - } - } -- else if ( sLine.GetTokenCount( '\t' ) == 10 ){ -+ else if ( nToks == 10 ) { - printf("ERROR: File format is obsolete and no longer supported!\n"); - } - } -@@ -286,7 +301,7 @@ - ByteString sRet( "MergeDataFile\n" ); - - //sRet.Append( Export::DumpMap( "aLanguageSet" , aLanguageSet ) ); -- //sRet.Append( Export::DumpMap( "aLanguages" , aLanguages ) ); -+ //sRet.Append( Export::DumpMap( "aLanguageList" , aLanguageList ) ); - printf("MergeDataFile\n"); - MergeDataHashMap::const_iterator idbg; - for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){ -@@ -318,7 +333,7 @@ - fprintf( stderr, "%s\n", rLine.GetBuffer()); - } - std::vector MergeDataFile::GetLanguages(){ -- return aLanguages; -+ return aLanguageList; - } - - /*****************************************************************************/ -@@ -379,23 +394,32 @@ - const ByteString &rLID, const ByteString &rPFO, - const ByteString &nLANG, const ByteString &rTEXT, - const ByteString &rQHTEXT, const ByteString &rTITLE , -- const ByteString &rFilename , bool bCaseSensitive -+ const ByteString &rInFilename , bool bCaseSensitive - ) - /*****************************************************************************/ - { - MergeData *pData; - BOOL bFound = FALSE; - -- // search for MergeData -+ // uniquify the filename to save memory. -+ ByteStringHashMap::const_iterator fit = aFilenames.find (rInFilename); -+ ByteString aFilename; -+ if (fit == aFilenames.end()) { -+ aFilename = rInFilename; -+ aFilenames.insert (ByteStringHashMap::value_type (aFilename, aFilename)); -+ } else -+ aFilename = fit->first; - -- ByteString sKey = CreateKey( rTYP , rGID , rLID , rFilename , bCaseSensitive ); -- ByteString sKey2; -+ // search for MergeData - -- if( aMap.find( sKey ) != aMap.end() ){ -- pData = aMap[ sKey ]; -+ ByteString sKey = CreateKey( rTYP , rGID , rLID , aFilename , bCaseSensitive ); -+ MergeDataHashMap::const_iterator mit; -+ mit = aMap.find( sKey ); -+ if( mit != aMap.end() ){ -+ pData = mit->second; - }else{ -- pData = new MergeData( rTYP, rGID, rLID , rFilename ); -- aMap.insert( MergeDataHashMap::value_type( CreateKey( rTYP , rGID , rLID , rFilename , bCaseSensitive ) , pData ) ); -+ pData = new MergeData( rTYP, rGID, rLID, aFilename ); -+ aMap.insert( MergeDataHashMap::value_type( sKey, pData ) ); - } - - bFound = FALSE; -- cgit v1.2.3