XStyleLoader: always use default arguments

2 files changed, 12 insertions, 21 deletions

diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 96014024eb05..a474e3ead4ee 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unostyle.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dvo $ $Date: 2001-01-30 13:17:24 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:32:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,12 +126,6 @@ class SwXStyleFamilies :  public cppu::WeakImplHelper4
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > *   pxPageStyles;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > *   pxNumberingStyles;
 
-    sal_Bool                bLoadStyleText      : 1;
-    sal_Bool                bLoadStyleFrame     : 1;
-    sal_Bool                bLoadStylePage      : 1;
-    sal_Bool                bLoadStyleOverwrite : 1;
-    sal_Bool                bLoadStyleNumbering : 1;
-
 public:
     SwXStyleFamilies(SwDocShell& rDocShell);
     virtual ~SwXStyleFamilies();
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 37ccc0157da8..712a320b052d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unostyle.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: os $ $Date: 2001-02-19 08:04:57 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:32:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -460,12 +460,7 @@ SwXStyleFamilies::SwXStyleFamilies(SwDocShell& rDocShell) :
     pxFrameStyles(0),
     pxPageStyles(0),
     pxNumberingStyles(0),
-    pDocShell(&rDocShell),
-    bLoadStyleText(sal_True),
-    bLoadStyleFrame(sal_True),
-    bLoadStylePage(sal_True),
-    bLoadStyleOverwrite(sal_False),
-    bLoadStyleNumbering(sal_True)
+    pDocShell(&rDocShell)
 {
 
 }
@@ -640,6 +635,12 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
     throw( io::IOException, RuntimeException )
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
+    sal_Bool    bLoadStyleText = sal_True;
+    sal_Bool    LoadStyleFrame = sal_True;
+    sal_Bool    bLoadStylePage = sal_True;
+    sal_Bool    bLoadStyleOverwrite = sal_True;
+    sal_Bool    bLoadStyleNumbering = sal_True;
+    sal_Bool    bLoadStyleFrame = sal_True;
     if(IsValid() && rURL.len())
     {
         const Any* pVal;
@@ -687,19 +688,15 @@ Sequence< PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(void)
     Sequence< PropertyValue > aSeq(5);
     PropertyValue* pArray = aSeq.getArray();
     Any aVal;
-    sal_Bool bTemp = bLoadStyleText;
+    sal_Bool bTemp = sal_True;
     aVal.setValue(&bTemp, ::getCppuBooleanType());
     pArray[0] = PropertyValue(C2U(UNO_NAME_LOAD_TEXT_STYLES), -1, aVal, PropertyState_DIRECT_VALUE);
-    bTemp = bLoadStyleFrame;
     aVal.setValue(&bTemp, ::getCppuBooleanType());
     pArray[1] = PropertyValue(C2U(UNO_NAME_LOAD_FRAME_STYLES), -1, aVal, PropertyState_DIRECT_VALUE);
-    bTemp = bLoadStylePage;
     aVal.setValue(&bTemp, ::getCppuBooleanType());
     pArray[2] = PropertyValue(C2U(UNO_NAME_LOAD_PAGE_STYLES), -1, aVal, PropertyState_DIRECT_VALUE);
-    bTemp = bLoadStyleNumbering;
     aVal.setValue(&bTemp, ::getCppuBooleanType());
     pArray[3] = PropertyValue(C2U(UNO_NAME_LOAD_NUMBERING_STYLES), -1, aVal, PropertyState_DIRECT_VALUE);
-    bTemp = bLoadStyleOverwrite;
     aVal.setValue(&bTemp, ::getCppuBooleanType());
     pArray[4] = PropertyValue(C2U(UNO_NAME_OVERWRITE_STYLES), -1, aVal, PropertyState_DIRECT_VALUE);
     return aSeq;