ooo-build r15216 - in trunk: . patches/dev300

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15216 - in trunk: . patches/dev300
Date: Wed, 28 Jan 2009 16:48:28 +0000 (UTC)
Author: kyoshida
Date: Wed Jan 28 16:48:28 2009
New Revision: 15216
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15216&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/layout-disable-experimental-m39.diff:
	* patches/dev300/layout-simple-dialogs-svx-m39.diff:
	* patches/dev300/layout-simple-dialogs-sw-m39.diff:
	* patches/dev300/layout-disable-experimental.diff:
	* patches/dev300/layout-simple-dialogs-svx.diff:
	* patches/dev300/layout-simple-dialogs-sw.diff:
	* patches/dev300/apply:	adjusted for dev300-m40.  Janneke, please check.


Added:
   trunk/patches/dev300/layout-disable-experimental-m39.diff   (props changed)
      - copied unchanged from r15209, /trunk/patches/dev300/layout-disable-experimental.diff
   trunk/patches/dev300/layout-simple-dialogs-svx-m39.diff   (props changed)
      - copied unchanged from r15209, /trunk/patches/dev300/layout-simple-dialogs-svx.diff
   trunk/patches/dev300/layout-simple-dialogs-sw-m39.diff   (props changed)
      - copied unchanged from r15209, /trunk/patches/dev300/layout-simple-dialogs-sw.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/layout-disable-experimental.diff
   trunk/patches/dev300/layout-simple-dialogs-svx.diff
   trunk/patches/dev300/layout-simple-dialogs-sw.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 16:48:28 2009
@@ -2640,8 +2640,16 @@
 layout-simple-dialogs-sfx2.diff
 layout-simple-dialogs-solenv.diff
 layout-simple-dialogs-starmath.diff
+
+[ LayoutDialogs <= dev300-m39 ]
+layout-simple-dialogs-svx-m39.diff
+layout-simple-dialogs-sw-m39.diff
+
+[ LayoutDialogs > dev300-m39 ]
 layout-simple-dialogs-svx.diff
 layout-simple-dialogs-sw.diff
+
+[ LayoutDialogs ]
 layout-simple-dialogs-toolkit.diff
 layout-simple-dialogs-vcl.diff
 layout-tab-sfx2-fix.diff, thorsten
@@ -2651,7 +2659,13 @@
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
 # These merge with the layoutdialogs2 cws
+[ LayoutDialogs <= dev300-m39 ]
+layout-disable-experimental-m39.diff
+
+[ LayoutDialogs > dev300-m39 ]
 layout-disable-experimental.diff
+
+[ LayoutDialogs ]
 layoutdialogs2-development.diff
 
 [ AutoCorrectCapsLock ]

Modified: trunk/patches/dev300/layout-disable-experimental.diff
==============================================================================
--- trunk/patches/dev300/layout-disable-experimental.diff	(original)
+++ trunk/patches/dev300/layout-disable-experimental.diff	Wed Jan 28 16:48:28 2009
@@ -5,8 +5,8 @@
 
 diff --git config_office/configure.in config_office/configure.in
 index 531db1e..00b7ab3 100644
---- config_office/configure.in
-+++ config_office/configure.in
+--- configure.in.old
++++ configure.in
 @@ -239,6 +239,10 @@ AC_ARG_ENABLE(static-gtk,
  AC_ARG_ENABLE(layout,
  [  --disable-layout        Disable the compilation and use of layout dialogs
@@ -37,8 +37,8 @@
  # ===================================================================
 diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
 index c6bd1de..bf515bc 100644
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
+--- set_soenv.in.old
++++ set_soenv.in
 @@ -1982,6 +1982,7 @@ ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
  ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
  ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );

Modified: trunk/patches/dev300/layout-simple-dialogs-svx.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-svx.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-svx.diff	Wed Jan 28 16:48:28 2009
@@ -1,5 +1,5 @@
-diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
-index a62b23d..b63e1de 100644
+diff --git svx/inc/srchdlg.hxx svx/inc/srchdlg.hxx
+index 6403206..69b5315 100644
 --- svx/inc/srchdlg.hxx
 +++ svx/inc/srchdlg.hxx
 @@ -116,12 +116,19 @@ public:
@@ -22,7 +22,7 @@
  	SFX_DECL_CHILDWINDOW(SvxSearchDialogWrapper);
  };
  
-@@ -233,7 +240,7 @@ private:
+@@ -234,7 +241,7 @@ private:
  	ULONG			nModifyFlag;
  	String          aStylesStr;
  	String			aLayoutStr;
@@ -31,7 +31,7 @@
  
  	SvStringsDtor   aSearchStrings;
  	SvStringsDtor   aReplaceStrings;
-@@ -285,6 +292,8 @@ private:
+@@ -286,6 +293,8 @@ private:
  #endif
  };
  
@@ -40,23 +40,23 @@
  inline BOOL SvxSearchDialog::HasSearchAttributes() const
  {
  	int bLen = aSearchAttrText.GetText().Len();
-diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
-index a7f7051..75926eb 100644
+diff --git svx/source/dialog/makefile.mk svx/source/dialog/makefile.mk
+index 0bec229..38f7184 100644
 --- svx/source/dialog/makefile.mk
 +++ svx/source/dialog/makefile.mk
-@@ -39,6 +39,3 @@ ENABLE_EXCEPTIONS=TRUE
-+
+@@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
  .INCLUDE :  settings.mk
  .INCLUDE :  $(PRJ)$/util$/makefile.pmk
-- 
+ 
 -.IF "$(ENABLE_LAYOUT)" == "TRUE"
 -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
 -.ENDIF # ENABLE_LAYOUT == TRUE
-
+-
  .IF "$(ENABLE_GTK)" != ""
  CFLAGS+=-DENABLE_GTK
-diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
-index 4e9d1ca..52c98e2 100644
+ .ENDIF
+diff --git svx/source/dialog/srchdlg.cxx svx/source/dialog/srchdlg.cxx
+index 9f694b8..d57c0a1 100644
 --- svx/source/dialog/srchdlg.cxx
 +++ svx/source/dialog/srchdlg.cxx
 @@ -78,6 +78,8 @@
@@ -68,7 +68,7 @@
  using namespace com::sun::star::i18n;
  using namespace com::sun::star;
  using namespace comphelper;
-@@ -109,6 +111,11 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
+@@ -110,6 +112,11 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
  #define GetCheckBoxValue( rBox )								\
  	rBox.IsEnabled() ? rBox.IsChecked() : FALSE
  
@@ -80,7 +80,7 @@
  struct SearchDlg_Impl
  {
  	FixedText	aSearchFormats;
-@@ -126,7 +133,11 @@ struct SearchDlg_Impl
+@@ -127,7 +134,11 @@ struct SearchDlg_Impl
      util::URL   aCommand1URL;
      util::URL   aCommand2URL;
  
@@ -93,7 +93,7 @@
          aSearchFormats  ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ),
          aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ),
          bMultiLineEdit  ( FALSE ),
-@@ -316,9 +327,18 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
+@@ -317,9 +328,18 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
  	pPage->SetTransliterationFlags( nSettings );
  }
  */ //CHINA001
@@ -114,7 +114,7 @@
  #define INI_LIST() \
  	aSearchText 	( this, SVX_RES( FT_SEARCH ) ),							\
  	aSearchLB		( this, SVX_RES( ED_SEARCH ) ),							\
-@@ -371,7 +391,7 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
+@@ -373,7 +393,7 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
  	bReadOnly		( FALSE ),												\
  	bConstruct		( TRUE ),												\
  	nModifyFlag		( 0 ),													\
@@ -123,7 +123,7 @@
      pImpl           ( NULL ),                                               \
  	pSearchList 	( NULL ),												\
  	pReplaceList	( NULL ),												\
-@@ -408,6 +428,10 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, Sf
+@@ -410,6 +430,10 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, Sf
  }
  
  #undef INI_LIST
@@ -134,7 +134,7 @@
  
  // -----------------------------------------------------------------------
  
-@@ -431,6 +455,11 @@ SvxSearchDialog::~SvxSearchDialog()
+@@ -433,6 +457,11 @@ SvxSearchDialog::~SvxSearchDialog()
  }
  
  // -----------------------------------------------------------------------
@@ -146,7 +146,7 @@
  void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
  {
      Point aPos(rWindow.GetPosPixel());
-@@ -440,16 +469,22 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
+@@ -442,16 +471,22 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
  
  void SvxSearchDialog::Construct_Impl()
  {
@@ -171,7 +171,7 @@
  
  	aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES );
  	aStylesStr = aLayoutBtn.GetText();
-@@ -715,6 +750,7 @@ void SvxSearchDialog::InitControls_Impl()
+@@ -719,6 +754,7 @@ void SvxSearchDialog::InitControls_Impl()
  	aLink = LINK( this, SvxSearchDialog, LoseFocusHdl_Impl );
  	aSearchLB.SetLoseFocusHdl( aLink );
  	aReplaceLB.SetLoseFocusHdl( aLink );
@@ -179,7 +179,7 @@
  	aSearchTmplLB.SetLoseFocusHdl( aLink );
  	aReplaceTmplLB.SetLoseFocusHdl( aLink );
  
-@@ -886,6 +922,8 @@ void SvxSearchDialog::CalculateDelta_Impl()
+@@ -916,6 +952,8 @@ void SvxSearchDialog::CalculateDelta_Impl()
      pMoreBtn->Enable();
  }
  
@@ -188,7 +188,7 @@
  // -----------------------------------------------------------------------
  
  void SvxSearchDialog::Init_Impl( int bSearchPattern )
-@@ -1469,7 +1507,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
+@@ -1530,7 +1568,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
  		SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
  		if(pFact)
  		{
@@ -197,7 +197,7 @@
  																		pSearchItem->IsLEVRelaxed(),
  																		pSearchItem->GetLEVOther(),
  																		pSearchItem->GetLEVShorter(),
-@@ -1495,7 +1533,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
+@@ -1556,7 +1594,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
          SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
  		if(pFact)
  		{
@@ -206,7 +206,7 @@
  			DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
  			int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
  			if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
-@@ -1514,7 +1552,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
+@@ -1575,7 +1613,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
          pArgs[0].Name = ::rtl::OUString::createFromAscii("SearchString");
          pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText());
          pArgs[1].Name = ::rtl::OUString::createFromAscii("ParentWindow");
@@ -215,7 +215,7 @@
          if(pBtn == &aSearchComponent1PB)
          {
              if ( pImpl->xCommand1Dispatch.is() )
-@@ -2018,6 +2056,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
+@@ -2091,6 +2129,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
  	aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
  
  	ModifyHdl_Impl( (ComboBox*)pCtrl );
@@ -223,7 +223,7 @@
  	aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aStylesStr );
  	return 0;
  }
-@@ -2091,7 +2130,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
+@@ -2164,7 +2203,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
  	SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
  	if(pFact)
  	{
@@ -232,7 +232,7 @@
  		DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
  		aTxt.Insert( pDlg->GetText(), 0 );
  		pDlg->SetText( aTxt );
-@@ -2168,7 +2207,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
+@@ -2241,7 +2280,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
  	SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
  	if(pFact)
  	{
@@ -241,7 +241,7 @@
  		DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
  		pDlg->Execute();
  		delete pDlg;
-@@ -2327,7 +2366,9 @@ void SvxSearchDialog::PaintAttrText_Impl()
+@@ -2400,7 +2439,9 @@ void SvxSearchDialog::PaintAttrText_Impl()
  
  void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
  {
@@ -252,7 +252,7 @@
  		nModifyFlag |= MODIFY_SEARCH;
  	else if ( &aReplaceLB == (ComboBox*)pCtrl )
  		nModifyFlag |= MODIFY_REPLACE;
-@@ -2414,25 +2455,38 @@ void SvxSearchDialog::SaveToModule_Impl()
+@@ -2490,25 +2531,38 @@ void SvxSearchDialog::SaveToModule_Impl()
  
  // class SvxSearchDialogWrapper ------------------------------------------
  
@@ -298,7 +298,7 @@
  }
  
  // -----------------------------------------------------------------------
-diff --git a/svx/source/dialog/zoom.cxx b/svx/source/dialog/zoom.cxx
+diff --git svx/source/dialog/zoom.cxx svx/source/dialog/zoom.cxx
 index ef1b8e2..50dc336 100644
 --- svx/source/dialog/zoom.cxx
 +++ svx/source/dialog/zoom.cxx
@@ -326,7 +326,7 @@
  	Link aLink = LINK( this, SvxZoomDialog, UserHdl );
      a100Btn.SetClickHdl( aLink );
      aOptimalBtn.SetClickHdl( aLink );
-diff --git a/svx/uiconfig/layout/find-and-replace.xml b/svx/uiconfig/layout/find-and-replace.xml
+diff --git svx/uiconfig/layout/find-and-replace.xml svx/uiconfig/layout/find-and-replace.xml
 new file mode 100644
 index 0000000..ad5af2b
 --- /dev/null
@@ -443,7 +443,7 @@
 +	</hbox>
 +    </vbox>
 +</sfxmodelessdialog>
-diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk
+diff --git svx/uiconfig/layout/layout.mk svx/uiconfig/layout/layout.mk
 deleted file mode 100644
 index 8c939b0..0000000
 --- svx/uiconfig/layout/layout.mk
@@ -482,8 +482,8 @@
 -# Don't want to overwrite filled localize.sdf with empty template
 -template.sdf:
 -	$(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
-diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
-index 2c8ccc8..d7c3ed9 100644
+diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk
+index d22d6eb..ec4f833 100644
 --- svx/uiconfig/layout/makefile.mk
 +++ svx/uiconfig/layout/makefile.mk
 @@ -39,7 +39,10 @@ TARGET=layout
@@ -508,7 +508,7 @@
 +	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", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
 +	echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
 +	rm -f *-$@
-diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml
+diff --git svx/uiconfig/layout/zoom.xml svx/uiconfig/layout/zoom.xml
 index abed333..5938643 100644
 --- svx/uiconfig/layout/zoom.xml
 +++ svx/uiconfig/layout/zoom.xml
@@ -561,11 +561,11 @@
  	<dialogbuttonhbox border="5" spacing="5">
  	    <flow/>
  	    <okbutton     id="BTN_ZOOM_OK"/>
-diff --git a/svx/util/makefile.pmk b/svx/util/makefile.pmk
-index 028a32e..4831744 100644
+diff --git svx/util/makefile.pmk svx/util/makefile.pmk
+index f45826f..27f185e 100644
 --- svx/util/makefile.pmk
 +++ svx/util/makefile.pmk
-@@ -36,12 +36,6 @@ CDEFS += -DSVX_DLLIMPLEMENTATION
+@@ -36,10 +36,4 @@ CDEFS += -DSVX_DLLIMPLEMENTATION
  CFLAGS+=-DENABLE_GTK
  .ENDIF
  
@@ -575,6 +575,4 @@
 -CFLAGS+=-DENABLE_LAYOUT=0
 -.ENDIF # ENABLE_LAYOUT == TRUE
 -
- # set default symbol visibility / scope to hidden
- .IF "$(COMNAME)" == "gcc3"
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ VISIBILITY_HIDDEN=TRUE

Modified: trunk/patches/dev300/layout-simple-dialogs-sw.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-sw.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-sw.diff	Wed Jan 28 16:48:28 2009
@@ -1,17 +1,16 @@
-diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
-index de00672..1ccca23 100644
+diff --git sw/inc/mdiexp.hxx sw/inc/mdiexp.hxx
+index fa7d9f6..97b3187 100644
 --- sw/inc/mdiexp.hxx
 +++ sw/inc/mdiexp.hxx
-@@ -32,6 +32,8 @@
- 
+@@ -33,6 +33,7 @@
  #include <tools/solar.h>
  #include <tblenum.hxx>
+ #include <swdllapi.h>
 +#include <layout/layout.hxx>
-+
+ 
  class UniString;
  class SwRect;
- class Size;
-@@ -61,7 +63,7 @@ void RescheduleProgress( SwDocShell *pDocShell );
+@@ -63,7 +64,7 @@ void RescheduleProgress( SwDocShell *pDocShell );
  
  void EnableCmdInterface(BOOL bEnable = TRUE);
  
@@ -20,11 +19,11 @@
  
  void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect );
  
-diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
-index dbd0a1b..c2add0d 100644
+diff --git sw/source/core/crsr/viscrs.cxx sw/source/core/crsr/viscrs.cxx
+index 871f09c..aa50883 100644
 --- sw/source/core/crsr/viscrs.cxx
 +++ sw/source/core/crsr/viscrs.cxx
-@@ -1126,7 +1126,7 @@ SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
+@@ -996,7 +996,7 @@ SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
  short SwShellCrsr::MaxReplaceArived()
  {
      short nRet = RET_YES;
@@ -33,7 +32,7 @@
  	if( pDlg )
  	{
  		// alte Actions beenden; die Tabellen-Frames werden angelegt und
-diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
+diff --git sw/source/ui/dialog/makefile.mk sw/source/ui/dialog/makefile.mk
 index 1f16883..17ca965 100644
 --- sw/source/ui/dialog/makefile.mk
 +++ sw/source/ui/dialog/makefile.mk
@@ -48,7 +47,7 @@
  # --- Files --------------------------------------------------------
  
  SRS1NAME=$(TARGET)
-diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
+diff --git sw/source/ui/dialog/wordcountdialog.cxx sw/source/ui/dialog/wordcountdialog.cxx
 index 8639a68..8ae35e6 100644
 --- sw/source/ui/dialog/wordcountdialog.cxx
 +++ sw/source/ui/dialog/wordcountdialog.cxx
@@ -78,7 +77,7 @@
      FreeResource();
  }
  /*-- 06.04.2004 16:05:56---------------------------------------------------
-diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
+diff --git sw/source/ui/docvw/edtwin3.cxx sw/source/ui/docvw/edtwin3.cxx
 index af37a99..fbe37b1 100644
 --- sw/source/ui/docvw/edtwin3.cxx
 +++ sw/source/ui/docvw/edtwin3.cxx
@@ -91,8 +90,8 @@
  {
  	return SwView::GetSearchDialog();
  }
-diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
-index 1fe66b1..db9f5c3 100644
+diff --git sw/source/ui/inc/view.hxx sw/source/ui/inc/view.hxx
+index fcb7241..f2f87c7 100644
 --- sw/source/ui/inc/view.hxx
 +++ sw/source/ui/inc/view.hxx
 @@ -41,6 +41,7 @@
@@ -103,7 +102,7 @@
  
  class SwBaseShell;
  class Button;
-@@ -490,7 +491,7 @@ public:
+@@ -488,7 +489,7 @@ public:
  			void	SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE);
  			void	CheckVisArea();
  
@@ -112,8 +111,8 @@
  
  	static USHORT	GetMoveType();
  	static void		SetMoveType(USHORT nSet);
-diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
-index b09c566..e19915e 100644
+diff --git sw/source/ui/uiview/viewsrch.cxx sw/source/ui/uiview/viewsrch.cxx
+index 984c2ee..4eb97d8 100644
 --- sw/source/ui/uiview/viewsrch.cxx
 +++ sw/source/ui/uiview/viewsrch.cxx
 @@ -106,7 +106,7 @@ inline Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
@@ -143,7 +142,7 @@
  				}
  				else
  					pSrchDlg = 0;
-@@ -494,7 +494,7 @@ BOOL SwView::SearchAndWrap(BOOL bApi)
+@@ -493,7 +493,7 @@ BOOL SwView::SearchAndWrap(BOOL bApi)
  
  	const USHORT nId = SvxSearchDialogWrapper::GetChildWindowId();
  	SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
@@ -152,7 +151,7 @@
  
  		// falls Startposition am Dokumentende / -anfang
  	if (aOpts.bDontWrap)
-@@ -727,19 +727,17 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
+@@ -728,19 +728,17 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
  	return nFound;
  }
  
@@ -174,7 +173,7 @@
  void SwView::StateSearch(SfxItemSet &rSet)
  {
  	SfxWhichIter aIter(rSet);
-diff --git a/sw/uiconfig/layout/layout.mk b/sw/uiconfig/layout/layout.mk
+diff --git sw/uiconfig/layout/layout.mk sw/uiconfig/layout/layout.mk
 deleted file mode 100644
 index 88164bb..0000000
 --- sw/uiconfig/layout/layout.mk
@@ -213,11 +212,8 @@
 -# Don't want to overwrite filled localize.sdf with empty template
 -template.sdf:
 -	$(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
-diff --git a/sw/uiconfig/layout/localize.sdf b/sw/uiconfig/layout/localize.sdf
-deleted file mode 100644
-index 78d502d..0000000
-diff --git a/sw/uiconfig/layout/makefile.mk b/sw/uiconfig/layout/makefile.mk
-index e951307..7ca393c 100644
+diff --git sw/uiconfig/layout/makefile.mk sw/uiconfig/layout/makefile.mk
+index b577653..5f4bc52 100644
 --- sw/uiconfig/layout/makefile.mk
 +++ sw/uiconfig/layout/makefile.mk
 @@ -48,3 +48,8 @@ all .PHONY:
@@ -229,7 +225,7 @@
 +	grep wordcountdialog.src $(PRJ)/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", "sw\\uiconfig\\layout\\wordcount.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/\tDLG_WORDCOUNT_title/' > wordcount-$@
 +	echo '#empty' | cat - wordcount-$@ > $@
 +	rm -f *-$@
-diff --git a/sw/uiconfig/layout/wordcount.xml b/sw/uiconfig/layout/wordcount.xml
+diff --git sw/uiconfig/layout/wordcount.xml sw/uiconfig/layout/wordcount.xml
 index ae33571..e922294 100644
 --- sw/uiconfig/layout/wordcount.xml
 +++ sw/uiconfig/layout/wordcount.xml
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]