renaissance2: merge to m73

1 files changed, 20 insertions, 23 deletions

diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index c0e605cac79e..e0b48a6cf57b 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TitleBar.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -216,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)
@@ -462,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;
+     }
 }