changefileheader2: #i10000#: convert files with CR/LF characters to CR only

11 files changed, 129 insertions, 129 deletions

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 17f1d914c3e5..c82bda44f846 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -301,8 +301,8 @@ public:
     OKButton            maFinishButton;
     SdDocPreviewWin     maPreview;
 
-    String              maCreateStr;

-    String              maOpenStr;

+    String              maCreateStr;
+    String              maOpenStr;
 
     // Seite 1
     FixedBitmap*        mpPage1FB;
@@ -382,8 +382,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     maLastPageButton(pWindow,SdResId(BUT_LAST)),
     maNextPageButton(pWindow,SdResId(BUT_NEXT)),
     maFinishButton(pWindow,SdResId(BUT_FINISH)),
-    maPreview(pWindow,SdResId(CT_PREVIEW)),

-    maCreateStr(SdResId(STR_CREATE)),

+    maPreview(pWindow,SdResId(CT_PREVIEW)),
+    maCreateStr(SdResId(STR_CREATE)),
     maOpenStr(SdResId(STR_OPEN))
 {
     maPageListFile += sal_Unicode('?'),
@@ -971,9 +971,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1OpenLB->Show(eType == ST_OPEN);
     mpPage1OpenPB->Show(eType == ST_OPEN);
 
-    if (eType == ST_OPEN)

-        maFinishButton.SetText(maOpenStr);

-    else

+    if (eType == ST_OPEN)
+        maFinishButton.SetText(maOpenStr);
+    else
         maFinishButton.SetText(maCreateStr);
 }
 
diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
index bc11aa98f6a8..b4c146eb0df2 100644
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
@@ -531,14 +531,14 @@ ModalDialog DLG_ASS
         Text [ en-US ] = "~Create" ;
     };
 
-    String STR_OPEN

-    {

-        Text [ en-US ] = "~Open";

-    };

-

-    String STR_CREATE

-    {

-        Text [ en-US ] = "~Create" ;

+    String STR_OPEN
+    {
+        Text [ en-US ] = "~Open";
+    };
+
+    String STR_CREATE
+    {
+        Text [ en-US ] = "~Create" ;
     };
 };
 
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index a3268e5e44a8..770412f72976 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -168,9 +168,9 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
             AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
             AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
             AddTabPage( RID_SVXPAGE_TEXTATTR );
-            AddTabPage( RID_SVXPAGE_PICK_BULLET );

-            AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );

-            AddTabPage( RID_SVXPAGE_PICK_BMP );

+            AddTabPage( RID_SVXPAGE_PICK_BULLET );
+            AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
+            AddTabPage( RID_SVXPAGE_PICK_BMP );
             AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
             AddTabPage( RID_SVXPAGE_TABULATOR );
         }
diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src
index 33ca93a5c1d1..d7251c084c3d 100644
--- a/sd/source/ui/dlg/prltempl.src
+++ b/sd/source/ui/dlg/prltempl.src
@@ -83,35 +83,35 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE
                 Text [ en-US ] = "Indents & Spacing" ;
                 PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
             };
-            PageItem

-             {

-                Identifier = RID_SVXPAGE_TEXTATTR ;

-                PageResID = RID_SVXPAGE_TEXTATTR ;

-                Text [ en-US ] = "Text" ;

-            };
-            PageItem

-            {

-                Identifier = RID_SVXPAGE_PICK_BULLET ;

-                PageResID = RID_SVXPAGE_PICK_BULLET ;

-                Text [ en-US ] = "Bullets" ;

-            };

-            PageItem

-            {

-                Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;

-                PageResID = RID_SVXPAGE_PICK_SINGLE_NUM ;

-                Text [ en-US ] = "Numbering type" ;

-            };

-            PageItem

-            {

-                Identifier = RID_SVXPAGE_PICK_BMP ;

-                PageResID = RID_SVXPAGE_PICK_BMP ;

-                Text [ en-US ] = "Graphics" ;

-            };

-            PageItem

-            {

-                Identifier = RID_SVXPAGE_NUM_OPTIONS ;

-                PageResID = RID_SVXPAGE_NUM_OPTIONS ;

-                Text [ en-US ] = "Customize" ;

+            PageItem
+             {
+                Identifier = RID_SVXPAGE_TEXTATTR ;
+                PageResID = RID_SVXPAGE_TEXTATTR ;
+                Text [ en-US ] = "Text" ;
+            };
+            PageItem
+            {
+                Identifier = RID_SVXPAGE_PICK_BULLET ;
+                PageResID = RID_SVXPAGE_PICK_BULLET ;
+                Text [ en-US ] = "Bullets" ;
+            };
+            PageItem
+            {
+                Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
+                PageResID = RID_SVXPAGE_PICK_SINGLE_NUM ;
+                Text [ en-US ] = "Numbering type" ;
+            };
+            PageItem
+            {
+                Identifier = RID_SVXPAGE_PICK_BMP ;
+                PageResID = RID_SVXPAGE_PICK_BMP ;
+                Text [ en-US ] = "Graphics" ;
+            };
+            PageItem
+            {
+                Identifier = RID_SVXPAGE_NUM_OPTIONS ;
+                PageResID = RID_SVXPAGE_NUM_OPTIONS ;
+                Text [ en-US ] = "Customize" ;
             };
             PageItem
             {
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 962e42d2fa87..dbf2a1ed40a6 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -209,7 +209,7 @@ protected:
         ::com::sun::star::accessibility::XAccessible>
         CreateAccessible (void);
 
-    XubString GetSurroundingText() const;

+    XubString GetSurroundingText() const;
     Selection GetSurroundingTextSelection() const;
 };
 
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index 3f738ba8d489..b10adcef07e0 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -89,7 +89,7 @@ public:
     virtual void Paint (const Rectangle& rBoundingBox);
     virtual bool Expand (bool bFlag = true);
     virtual bool IsExpanded (void) const;
-    virtual void SetEnabledState(bool bFlag);

+    virtual void SetEnabledState(bool bFlag);
 
     void SetFocus (bool bFlag);
 
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index a18758d6475e..a5a319ca5219 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -132,7 +132,7 @@ public:
     */
     virtual bool IsExpandable (void) const;
 
-    virtual void SetEnabledState(bool bFlag);

+    virtual void SetEnabledState(bool bFlag);
 
     /** Ownership of the given data remains with the caller.  The data
         is thus not destroyed when the destructor of this class is
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index 27b95462a871..e0b48a6cf57b 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -213,14 +213,14 @@ bool TitleBar::IsExpanded (void) const
 }
 
 
-void TitleBar::SetEnabledState(bool bFlag)

-{

-    if(bFlag)

-        Enable();

-    else

-        Disable();

-    Invalidate ();

-}

+void TitleBar::SetEnabledState(bool bFlag)
+{
+    if(bFlag)
+        Enable();
+    else
+        Disable();
+    Invalidate ();
+}
 
 
 void TitleBar::SetFocus (bool bFlag)
@@ -459,17 +459,17 @@ void TitleBar::PaintText (const Rectangle& rTextBox)
 
 USHORT TitleBar::GetTextStyle (void)
 {
-     if(IsEnabled())

-     {

-         return TEXT_DRAW_LEFT 

-             | TEXT_DRAW_TOP

-             | TEXT_DRAW_MULTILINE 

-             | TEXT_DRAW_WORDBREAK;

-     }

-     else

-     {

-         return TEXT_DRAW_DISABLE;

-     }

+     if(IsEnabled())
+     {
+         return TEXT_DRAW_LEFT
+             | TEXT_DRAW_TOP
+             | TEXT_DRAW_MULTILINE
+             | TEXT_DRAW_WORDBREAK;
+     }
+     else
+     {
+         return TEXT_DRAW_DISABLE;
+     }
 }
 
 
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index 8c30a666dd30..7930bb4cd7f1 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -335,27 +335,27 @@ bool TitledControl::IsExpanded (void) const
         return false;
 }
 
-void TitledControl::SetEnabledState(bool bFlag) 

-{

-    if (!bFlag)

-    {

-        GetParentNode()->GetControlContainer().SetExpansionState (

-            this,

-            ControlContainer::ES_COLLAPSE);

-        Disable();

-    }

-    else 

-    {

-/*    

-        GetParentNode()->GetControlContainer().SetExpansionState (

-            this,

-            ControlContainer::ES_EXPAND);

-*/         

-        Enable();

-    }

-

-    GetTitleBar()->SetEnabledState(bFlag);

-}

+void TitledControl::SetEnabledState(bool bFlag)
+{
+    if (!bFlag)
+    {
+        GetParentNode()->GetControlContainer().SetExpansionState (
+            this,
+            ControlContainer::ES_COLLAPSE);
+        Disable();
+    }
+    else
+    {
+/*
+        GetParentNode()->GetControlContainer().SetExpansionState (
+            this,
+            ControlContainer::ES_EXPAND);
+*/
+        Enable();
+    }
+
+    GetTitleBar()->SetEnabledState(bFlag);
+}
 
 
 
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index eaae0b7071f7..cea33fda98bf 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -170,10 +170,10 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq )
                     aStr.Append( String( SdResId( STR_UNDO_GRAFFILTER ) ) );
                     mpView->BegUndo( aStr );
                     pFilteredObj->SetGraphicObject( aFilterObj );
-                    ::sd::View* const pView = mpView;

-                    pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );

-                    pView->EndUndo();

-                    return;

+                    ::sd::View* const pView = mpView;
+                    pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );
+                    pView->EndUndo();
+                    return;
                 }
             }
         }
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index ebccdbee6dec..ca0c60b78dcb 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -34,8 +34,8 @@
 
 #include <sfx2/viewfrm.hxx>
 
-#include <svx/outliner.hxx>

- 

+#include <svx/outliner.hxx>
+
 #include <svx/editview.hxx>
 
 #include "app.hrc"
@@ -1206,38 +1206,38 @@ void Window::DropScroll(const Point& rMousePos)
     }
 }
 
-XubString Window::GetSurroundingText() const

-{

-    if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )

-    {

-        return XubString();

-    }

-    else if ( mpViewShell->GetView()->IsTextEdit() )

-    {

-        OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();

-        return pOLV->GetEditView().GetSurroundingText();

-    }

-    else

-    {

-        return XubString();

-    }

-}

-

-Selection Window::GetSurroundingTextSelection() const

-{

-    if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )

-    {

-        return Selection( 0, 0 );

-    }

-    else if ( mpViewShell->GetView()->IsTextEdit() )

-    {

-        OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();

-        return pOLV->GetEditView().GetSurroundingTextSelection();

-    }

-    else

-    {

-        return Selection( 0, 0 );

-    }

-}

+XubString Window::GetSurroundingText() const
+{
+    if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
+    {
+        return XubString();
+    }
+    else if ( mpViewShell->GetView()->IsTextEdit() )
+    {
+        OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
+        return pOLV->GetEditView().GetSurroundingText();
+    }
+    else
+    {
+        return XubString();
+    }
+}
+
+Selection Window::GetSurroundingTextSelection() const
+{
+    if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
+    {
+        return Selection( 0, 0 );
+    }
+    else if ( mpViewShell->GetView()->IsTextEdit() )
+    {
+        OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
+        return pOLV->GetEditView().GetSurroundingTextSelection();
+    }
+    else
+    {
+        return Selection( 0, 0 );
+    }
+}
 
 } // end of namespace sd