From eb52fad75717c6e0d16e93b39d3fb49132cf69d1 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Tue, 6 Oct 2009 07:38:24 +0200
Subject: #103496#: move VCL free ConfigItems to unotools

---
 sw/source/ui/uiview/srcview.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sw/source/ui/uiview/srcview.cxx')

diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index d30e85c5ee71..e43fadfbdeb8 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -45,12 +45,12 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/intitem.hxx>
 #include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/undo.hxx>
 #include <svtools/txtcmp.hxx>
 #include <svtools/eitem.hxx>
 #include <svtools/whiter.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <svtools/transfer.hxx>
 
 #include <svx/htmlcfg.hxx>
-- 
cgit 


From ed87eb8f7aec4990f65ed9c5b90738eab8b59e21 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 16 Oct 2009 00:05:16 +0200
Subject: #i103496#: split svtools; improve ConfitItems

---
 sw/source/ui/uiview/srcview.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sw/source/ui/uiview/srcview.cxx')

diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index e43fadfbdeb8..92467fe455d0 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -43,13 +43,13 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/metric.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <svtools/txtcmp.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <unotools/saveopt.hxx>
 #include <svtools/transfer.hxx>
 
-- 
cgit 


From ff016bd9d3e87d93db950c60ad7ccb5c31b5fa7a Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Thu, 3 Dec 2009 17:24:39 +0000
Subject: cmcfixes68: #i107420# remove trivial warnings from sw with newer gcc

---
 sw/source/ui/uiview/srcview.cxx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sw/source/ui/uiview/srcview.cxx')

diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index d30e85c5ee71..e93abdf73b15 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -717,6 +717,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
 
 
         if(!bApi)
+        {
             if(bNotFoundMessage)
             {
                 InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute();
@@ -728,6 +729,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
                 pTextView->SetSelection( TextSelection( aPaM, aPaM ) );
                 StartSearchAndReplace( rSearchItem, FALSE, FALSE, TRUE );
             }
+        }
     }
     return nFound;
 }
-- 
cgit