From af12942f68dba5d0d2b6fd39f63566d5fc3af4b8 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Fri, 11 Feb 2011 22:29:16 -0600
Subject: merge non-conflicting changes in svx

---
 svx/inc/svx/srchdlg.hxx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'svx/inc/svx/srchdlg.hxx')

diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index f767586559..690188e940 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,10 +89,10 @@ public:
     SearchAttrItem& GetObject( USHORT nPos ) const
                         { return SrchAttrItemList::GetObject( nPos ); }
 
-    // der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen)
+    // the pointer to the item is not being copierd, so don't delete
     void Insert( const SearchAttrItem& rItem )
         { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); }
-    // l"oscht die Pointer auf die Items
+    // deletes the pointer to the items
     void Remove( USHORT nPos, USHORT nLen = 1 );
 };
 
@@ -120,10 +121,10 @@ public:
 /*
     {k:\svx\prototyp\dialog\svx/srchdlg.hxx}
 
-    [Beschreibung]
-    In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt
-    und damit eine Suche gestartet. Es sind mehrere Sucharten
-    ( Suchen, Alle suchen, Ersetzen, Alle ersetzen ) m"oglich.
+    [Description]
+    In this modeless dialog the attributes for a search are configured
+    and a search is started from it. Several search types
+    (search, search all, replace, replace all) are possible.
 
     [Items]
     <SvxSearchItem><SID_ATTR_SEARCH>
@@ -160,6 +161,8 @@ public:
 
     INT32			GetTransliterationFlags() const;
 
+    void            SetSaveToModule(bool b);
+
 private:
     FixedText       aSearchText;
     ComboBox        aSearchLB;
@@ -218,9 +221,9 @@ private:
     BOOL            bSearch;
     BOOL            bFormat;
     USHORT          nOptions;
-    FASTBOOL		bSet;
-    FASTBOOL		bReadOnly;
-    FASTBOOL		bConstruct;
+    bool            bSet;
+    bool            bReadOnly;
+    bool            bConstruct;
     ULONG			nModifyFlag;
     String          aStylesStr;
     String			aLayoutStr;
@@ -300,3 +303,4 @@ inline BOOL SvxSearchDialog::HasReplaceAttributes() const
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit v1.2.3