summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-04-14 10:26:31 +0200
committerThomas Lange [tl] <tl@openoffice.org>2010-04-14 10:26:31 +0200
commitd72138f1408df33e07f6b33fd23bdfb101229a41 (patch)
tree8c9fdb5e56bd74575eeb0969b4c086dc800cdb8f /unotools
parentd78584a6e17bb35e0c6c01a306b31fa18bd14ef4 (diff)
parent0768a7d2726ce4f0772b52d95eeb23143336655c (diff)
cws tl74: merge with DEV300 m76
Diffstat (limited to 'unotools')
-rw-r--r--unotools/inc/unotools/saveopt.hxx4
-rw-r--r--unotools/source/config/saveopt.cxx60
2 files changed, 9 insertions, 55 deletions
diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index dad0cd742323..22cf75c5be3d 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.hxx
@@ -46,7 +46,6 @@ public:
E_AUTOSAVEPROMPT,
E_DOCINFSAVE,
E_SAVEWORKINGSET,
- E_SAVEDOCWINS,
E_SAVEDOCVIEW,
E_SAVERELINET,
E_SAVERELFSYS,
@@ -93,9 +92,6 @@ public:
void SetSaveWorkingSet( sal_Bool b );
sal_Bool IsSaveWorkingSet() const;
- void SetSaveDocWins( sal_Bool b );
- sal_Bool IsSaveDocWins() const;
-
void SetSaveDocView( sal_Bool b );
sal_Bool IsSaveDocView() const;
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 2b739316a3f9..cbb7e763b38a 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -73,7 +73,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bAutoSavePrompt,
bDocInfSave,
bSaveWorkingSet,
- bSaveDocWins,
bSaveDocView,
bSaveRelINet,
bSaveRelFSys,
@@ -89,7 +88,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bROAutoSavePrompt,
bRODocInfSave,
bROSaveWorkingSet,
- bROSaveDocWins,
bROSaveDocView,
bROSaveRelINet,
bROSaveRelFSys,
@@ -115,7 +113,6 @@ public:
BOOL IsAutoSavePrompt() const { return bAutoSavePrompt; }
BOOL IsDocInfoSave() const { return bDocInfSave; }
BOOL IsSaveWorkingSet() const { return bSaveWorkingSet; }
- BOOL IsSaveDocWins() const { return bSaveDocWins; }
BOOL IsSaveDocView() const { return bSaveDocView; }
BOOL IsSaveRelINet() const { return bSaveRelINet; }
BOOL IsSaveRelFSys() const { return bSaveRelFSys; }
@@ -133,7 +130,6 @@ public:
void SetAutoSavePrompt( BOOL b );
void SetDocInfoSave( BOOL b );
void SetSaveWorkingSet( BOOL b );
- void SetSaveDocWins( BOOL b );
void SetSaveDocView( BOOL b );
void SetSaveRelINet( BOOL b );
void SetSaveRelFSys( BOOL b );
@@ -211,15 +207,6 @@ void SvtSaveOptions_Impl::SetSaveWorkingSet( BOOL b )
}
}
-void SvtSaveOptions_Impl::SetSaveDocWins( BOOL b )
-{
- if (!bROSaveDocWins && bSaveDocWins!=b)
- {
- bSaveDocWins = b;
- SetModified();
- }
-}
-
void SvtSaveOptions_Impl::SetSaveDocView( BOOL b )
{
if (!bROSaveDocView && bSaveDocView!=b)
@@ -318,9 +305,6 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
case SvtSaveOptions::E_SAVEWORKINGSET :
bReadOnly = bROSaveWorkingSet;
break;
- case SvtSaveOptions::E_SAVEDOCWINS :
- bReadOnly = bROSaveDocWins;
- break;
case SvtSaveOptions::E_SAVEDOCVIEW :
bReadOnly = bROSaveDocView;
break;
@@ -356,16 +340,15 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
#define AUTOSAVE 4
#define PROMPT 5
#define EDITPROPERTY 6
-#define SAVEDOCWINS 7
-#define SAVEVIEWINFO 8
-#define UNPACKED 9
-#define PRETTYPRINTING 10
-#define WARNALIENFORMAT 11
-#define LOADDOCPRINTER 12
-#define FILESYSTEM 13
-#define INTERNET 14
-#define SAVEWORKINGSET 15
-#define ODFDEFAULTVERSION 16
+#define SAVEVIEWINFO 7
+#define UNPACKED 8
+#define PRETTYPRINTING 9
+#define WARNALIENFORMAT 10
+#define LOADDOCPRINTER 11
+#define FILESYSTEM 12
+#define INTERNET 13
+#define SAVEWORKINGSET 14
+#define ODFDEFAULTVERSION 15
Sequence< OUString > GetPropertyNames()
{
@@ -378,7 +361,6 @@ Sequence< OUString > GetPropertyNames()
"Document/AutoSave",
"Document/AutoSavePrompt",
"Document/EditProperty",
- "Document/DocumentWindows",
"Document/ViewInfo",
"Document/Unpacked",
"Document/PrettyPrinting",
@@ -410,7 +392,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
, bAutoSavePrompt( sal_False )
, bDocInfSave( sal_False )
, bSaveWorkingSet( sal_False )
- , bSaveDocWins( sal_False )
, bSaveDocView( sal_False )
, bSaveRelINet( sal_False )
, bSaveRelFSys( sal_False )
@@ -425,7 +406,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
, bROAutoSavePrompt( CFG_READONLY_DEFAULT )
, bRODocInfSave( CFG_READONLY_DEFAULT )
, bROSaveWorkingSet( CFG_READONLY_DEFAULT )
- , bROSaveDocWins( CFG_READONLY_DEFAULT )
, bROSaveDocView( CFG_READONLY_DEFAULT )
, bROSaveRelINet( CFG_READONLY_DEFAULT )
, bROSaveRelFSys( CFG_READONLY_DEFAULT )
@@ -515,10 +495,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
bSaveWorkingSet = bTemp;
bROSaveWorkingSet = pROStates[nProp];
break;
- case SAVEDOCWINS :
- bSaveDocWins = bTemp;
- bROSaveDocWins = pROStates[nProp];
- break;
case SAVEVIEWINFO :
bSaveDocView = bTemp;
bROSaveDocView = pROStates[nProp];
@@ -664,14 +640,6 @@ void SvtSaveOptions_Impl::Commit()
++nRealCount;
}
break;
- case SAVEDOCWINS :
- if (!bROSaveDocWins)
- {
- pValues[nRealCount] <<= bSaveDocWins;
- pNames[nRealCount] = pOrgNames[i];
- ++nRealCount;
- }
- break;
case SAVEVIEWINFO :
if (!bROSaveDocView)
{
@@ -937,16 +905,6 @@ sal_Bool SvtSaveOptions::IsSaveWorkingSet() const
return pImp->pSaveOpt->IsSaveWorkingSet();
}
-void SvtSaveOptions::SetSaveDocWins( sal_Bool b )
-{
- pImp->pSaveOpt->SetSaveDocWins( b );
-}
-
-sal_Bool SvtSaveOptions::IsSaveDocWins() const
-{
- return pImp->pSaveOpt->IsSaveDocWins();
-}
-
void SvtSaveOptions::SetSaveDocView( sal_Bool b )
{
pImp->pSaveOpt->SetSaveDocView( b );