summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/dialog/backgrnd.cxx16
-rw-r--r--svx/source/dialog/chardlg.cxx25
-rw-r--r--svx/source/dialog/impgrf.cxx34
-rw-r--r--svx/source/dialog/numpages.cxx36
-rw-r--r--svx/source/dialog/postdlg.cxx42
-rw-r--r--svx/source/dialog/tabarea.cxx12
-rw-r--r--svx/source/dialog/tabline.cxx10
-rw-r--r--svx/source/dialog/tpbitmap.cxx13
-rw-r--r--svx/source/dialog/tpcolor.cxx13
-rw-r--r--svx/source/dialog/tpgradnt.cxx14
-rw-r--r--svx/source/dialog/tphatch.cxx14
-rw-r--r--svx/source/dialog/tplnedef.cxx14
-rw-r--r--svx/source/dialog/tplneend.cxx14
13 files changed, 119 insertions, 138 deletions
diff --git a/svx/source/dialog/backgrnd.cxx b/svx/source/dialog/backgrnd.cxx
index 53cddf6bc530..2b1c9c3dc13f 100644
--- a/svx/source/dialog/backgrnd.cxx
+++ b/svx/source/dialog/backgrnd.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: backgrnd.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:06 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:36:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,6 +61,9 @@
// include ---------------------------------------------------------------
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
#ifndef _SFXINTITEM_HXX //autogen
#include <svtools/intitem.hxx>
#endif
@@ -70,15 +73,9 @@
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
-#endif
#ifndef _SFX_OBJSH_HXX //autogen
#include <sfx2/objsh.hxx>
#endif
-#ifndef _SFX_INIMGR_HXX
-#include <sfx2/inimgr.hxx>
-#endif
#ifndef _SFXDOCFILE_HXX
#include <sfx2/docfile.hxx>
#endif
@@ -1171,8 +1168,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
if ( !pColorTable )
{
bOwn = TRUE;
- pColorTable =
- new XColorTable( SFX_INIMANAGER()->Get( SFX_KEY_PALETTE_PATH ) );
+ pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
}
if ( pColorTable )
diff --git a/svx/source/dialog/chardlg.cxx b/svx/source/dialog/chardlg.cxx
index 1693224fdbfb..6e385b8f4ce2 100644
--- a/svx/source/dialog/chardlg.cxx
+++ b/svx/source/dialog/chardlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:07 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:36:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,9 +64,18 @@
#ifndef _UNO_LINGU_HXX
#include <unolingu.hxx>
#endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
#ifndef _CTRLTOOL_HXX //autogen
#include <svtools/ctrltool.hxx>
#endif
+#ifndef _SFONTITM_HXX
+#include <svtools/sfontitm.hxx>
+#endif
#ifndef _SFX_PRINTER_HXX //autogen
#include <sfx2/printer.hxx>
#endif
@@ -76,12 +85,6 @@
#ifndef _SFXVIEWSH_HXX
#include <sfx2/viewsh.hxx>
#endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <sfx2/inimgr.hxx>
-#endif
-#ifndef _SFONTITM_HXX
-#include <svtools/sfontitm.hxx>
-#endif
#pragma hdrstop
#define _SVX_CHARDLG_CXX
@@ -1114,18 +1117,16 @@ SvxCharStdPage::SvxCharStdPage( Window* pParent,
// ColorBox aus der XColorTable fuellen.
SfxObjectShell* pDocSh = SfxObjectShell::Current();
+ DBG_ASSERT( pDocSh, "DocShell not found!" );
XColorTable* pColorTable = NULL;
FASTBOOL bKillTable = FALSE;
- SfxIniManager* pIniMgr = SFX_INIMANAGER();
-
- DBG_ASSERT( pDocSh, "DocShell not found!" );
if ( pDocSh && ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) )
pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
if ( !pColorTable )
{
- pColorTable = new XColorTable( pIniMgr->Get( SFX_KEY_PALETTE_PATH ) );
+ pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
bKillTable = TRUE;
}
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
index 6750847bbcf7..5675c9aad1e6 100644
--- a/svx/source/dialog/impgrf.cxx
+++ b/svx/source/dialog/impgrf.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impgrf.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:09 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:36:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,12 +75,6 @@
#ifndef _SFXSTRITEM_HXX
#include <svtools/stritem.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
-#endif
-#ifndef _SFX_INIMGR_HXX
-#include <sfx2/inimgr.hxx>
-#endif
#ifndef _SFXDOCFILE_HXX
#include <sfx2/docfile.hxx>
#endif
@@ -93,6 +87,12 @@
#ifndef _SV_WAITOBJ_HXX //autogen
#include <vcl/waitobj.hxx>
#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
+#ifndef _SFX_INIMGR_HXX
+#include <sfx2/inimgr.hxx>
+#endif
#pragma hdrstop
#include <ucbhelper/content.hxx>
@@ -204,8 +204,8 @@ GraphicFilter* GetGrfFilter()
USHORT FillFilter( GraphicFilter& rFilter )
{
ResMgr* pMgr = DIALOG_MGR();
- SfxIniManager* pIniMgr = SFX_INIMANAGER();
- String aModulesPath( pIniMgr->Get( SFX_KEY_MODULES_PATH ) );
+ SvtPathOptions aPathOpt;
+ String aModulesPath( aPathOpt.GetModulePath() );
String aFullConfigPath;
for ( xub_StrLen i = 0, nCount = aModulesPath.GetTokenCount(); i < nCount; i++ )
@@ -221,11 +221,12 @@ USHORT FillFilter( GraphicFilter& rFilter )
rFilter.SetConfigPath( aFullConfigPath );
- INetURLObject aFilterPath( pIniMgr->Get( SFX_KEY_FILTER_PATH ), INET_PROT_FILE );
+ INetURLObject aFilterPath( aPathOpt.GetFilterPath(), INET_PROT_FILE );
rFilter.SetFilterPath( aFilterPath.getFSysPath( INetURLObject::FSYS_DETECT ) );
- INetURLObject aFltOptFile( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ), INET_PROT_FILE );
- aFltOptFile.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( IMPGRF_GRAPHIC_OPTIONS_FILE ) ) );
+ INetURLObject aFltOptFile( aPathOpt.GetUserConfigPath(), INET_PROT_FILE );
+ aFltOptFile.Append(
+ UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( IMPGRF_GRAPHIC_OPTIONS_FILE ) ) );
rFilter.SetOptionsConfigPath( aFltOptFile );
return rFilter.GetImportFormatCount();
@@ -628,7 +629,7 @@ void SvxImportGraphicDialog::Construct_Impl( const String &rTitle, USHORT nEnabl
// Ggf. "Eigenschaften" und "Verkn"upfung"
SfxApplication* pSfxApp = SFX_APP();
- SfxIniManager* pIniMgr = SFX_INIMANAGER();
+ SvtPathOptions aPathOpt;
if ( ( ( ENABLE_LINK & nEnable ) && ( ENABLE_PROPERTY & nEnable ) ) ||
( ENABLE_PROP_WITHOUTLINK & nEnable ) )
@@ -649,6 +650,7 @@ void SvxImportGraphicDialog::Construct_Impl( const String &rTitle, USHORT nEnabl
pFilterButton->SetHelpId( HID_IMPGRF_BTN_FILTER );
AddControl( pFilterButton );
pFilterButton->Show();
+ SfxIniManager* pIniMgr = SFX_INIMANAGER();
if ( ENABLE_LINK & nEnable )
{
@@ -741,10 +743,10 @@ void SvxImportGraphicDialog::Construct_Impl( const String &rTitle, USHORT nEnabl
}
// Pfad und Filter setzen
- aStartPath = pIniMgr->Get( SFX_KEY_GRAPHICS_PATH );
+ aStartPath = aPathOpt.GetGraphicPath();
FASTBOOL bGrfPath = ( aStartPath.Len() > 0 );
if ( !bGrfPath )
- aStartPath = pIniMgr->Get( SFX_KEY_WORK_PATH );
+ aStartPath = aPathOpt.GetWorkPath();
SetStandardDir( aStartPath );
String aLastPath;
if ( pPathItem )
diff --git a/svx/source/dialog/numpages.cxx b/svx/source/dialog/numpages.cxx
index 662dbf968f2e..4ace0862f217 100644
--- a/svx/source/dialog/numpages.cxx
+++ b/svx/source/dialog/numpages.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: numpages.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:10 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:36:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -125,15 +125,15 @@
#ifndef _SVX_DRAWITEM_HXX //autogen
#include <drawitem.hxx>
#endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <sfx2/inimgr.hxx>
-#endif
#ifndef _SVX_NUMVSET_HXX
#include <numvset.hxx>
#endif
#ifndef _SVX_HTMLMODE_HXX //autogen
#include <htmlmode.hxx>
#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
/*-----------------07.02.97 15.37-------------------
@@ -144,15 +144,14 @@
#define NUM_PAGETYPE_BMP 3
#define PAGETYPE_USER_START 10
+#define SHOW_NUMBERING 0
+#define SHOW_BULLET 1
+#define SHOW_BITMAP 2
-#define SHOW_NUMBERING 0
-#define SHOW_BULLET 1
-#define SHOW_BITMAP 2
-
-#define MAX_BMP_WIDTH 16
-#define MAX_BMP_HEIGHT 16
+#define MAX_BMP_WIDTH 16
+#define MAX_BMP_HEIGHT 16
-static BOOL bLastRelative = FALSE;
+static BOOL bLastRelative = FALSE;
/* -----------------27.10.98 15:40-------------------
*
@@ -1697,18 +1696,18 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
aSameLevelCB.Check(pActNum->IsContinuousNumbering());
//ColorListBox bei Bedarf fuellen
- if(pActNum->IsFeatureSupported(NUM_BULLET_COLOR))
+ if ( pActNum->IsFeatureSupported( NUM_BULLET_COLOR ) )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
+ DBG_ASSERT( pDocSh, "DocShell not found!" );
XColorTable* pColorTable = NULL;
FASTBOOL bKillTable = FALSE;
- DBG_ASSERT( pDocSh, "DocShell not found!" );
if ( pDocSh && ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) )
pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
if ( !pColorTable )
{
- pColorTable = new XColorTable( SFX_INIMANAGER()->Get( SFX_KEY_PALETTE_PATH));
+ pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
bKillTable = TRUE;
}
@@ -1717,7 +1716,8 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
XColorEntry* pEntry = pColorTable->Get(i);
aBulColLB.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
- if(bKillTable)
+
+ if ( bKillTable )
delete pColorTable;
}
@@ -3696,7 +3696,3 @@ void SvxNumOptionsTabPage::SetModified(BOOL bRepaint)
}
}
-
-
-
-
diff --git a/svx/source/dialog/postdlg.cxx b/svx/source/dialog/postdlg.cxx
index 6d5b3f138a53..282147207cad 100644
--- a/svx/source/dialog/postdlg.cxx
+++ b/svx/source/dialog/postdlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: postdlg.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:11 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:36:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,22 +64,20 @@
#ifndef _SHL_HXX
#include <tools/shl.hxx>
#endif
-
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#ifndef _MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
+#endif
#ifndef _SFXITEMPOOL_HXX //autogen
#include <svtools/itempool.hxx>
#endif
-
#ifndef _SFXITEMSET_HXX //autogen
#include <svtools/itemset.hxx>
#endif
-#ifndef _MSGBOX_HXX //autogen
-#include <vcl/msgbox.hxx>
-#endif
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
-#ifndef _SFX_INIMGR_HXX //autogen
-#include <sfx2/inimgr.hxx>
+#ifndef INCLUDED_SVTOOLS_USEROPTIONS_HXX
+#include <svtools/useroptions.hxx>
#endif
#pragma hdrstop
@@ -97,6 +95,7 @@
#include "dialmgr.hxx"
#include "helpid.hrc"
+
// static ----------------------------------------------------------------
static USHORT pRanges[] =
@@ -169,7 +168,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
aAuthorStr = rAuthor.GetValue();
}
else
- aAuthorStr = SFX_INIMANAGER()->Get(SFX_KEY_USER_ID);
+ aAuthorStr = SvtUserOptions().GetID();
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
@@ -261,15 +260,13 @@ IMPL_LINK_INLINE_END( SvxPostItDialog, NextHdl, Button *, EMPTYARG )
IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG )
{
- Date aDate;
- Time aTime;
- String aTmp( SFX_INIMANAGER()->Get(SFX_KEY_USER_ID) );
+ Date aDate;
+ Time aTime;
+ String aTmp( SvtUserOptions().GetID() );
International aInter( GetpApp()->GetAppInternational() );
String aStr( aEditED.GetText() );
-
aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\n---- " ) );
-
if ( aTmp.Len() > 0 )
{
aStr += aTmp;
@@ -294,14 +291,13 @@ IMPL_LINK( SvxPostItDialog, OKHdl, Button *, EMPTYARG )
{
International aInter( GetpApp()->GetAppInternational() );
pOutSet = new SfxItemSet( rSet );
- pOutSet->Put( SvxPostItAuthorItem( SFX_INIMANAGER()->Get(SFX_KEY_USER_ID),
- rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR ) ) );
+ pOutSet->Put( SvxPostItAuthorItem( SvtUserOptions().GetID(),
+ rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR ) ) );
pOutSet->Put( SvxPostItDateItem( aInter.GetDate( Date() ),
- rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE ) ) );
+ rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE ) ) );
pOutSet->Put( SvxPostItTextItem( aEditED.GetText(),
- rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ) ) );
+ rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ) ) );
EndDialog( RET_OK );
return 0;
}
-
diff --git a/svx/source/dialog/tabarea.cxx b/svx/source/dialog/tabarea.cxx
index eff60bc83b81..7a5ade00447d 100644
--- a/svx/source/dialog/tabarea.cxx
+++ b/svx/source/dialog/tabarea.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabarea.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:12 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:36:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,9 +63,6 @@
#pragma hdrstop
#include <tools/ref.hxx>
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
#ifndef _SFXAPP_HXX //autogen
#include <sfx2/app.hxx>
#endif
@@ -75,6 +72,9 @@
#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
#endif
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
+#endif
#ifndef _SVDMARK_HXX //autogen
#include <svdmark.hxx>
#endif
@@ -204,7 +204,7 @@ void SvxAreaTabDialog::SavePalettes()
// Speichern der Tabellen, wenn sie geaendert wurden.
- const String aPath( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ const String aPath( SvtPathOptions().GetPalettePath() );
if( nHatchingListState & CT_MODIFIED )
{
diff --git a/svx/source/dialog/tabline.cxx b/svx/source/dialog/tabline.cxx
index 28725916da26..168dddf3ebf5 100644
--- a/svx/source/dialog/tabline.cxx
+++ b/svx/source/dialog/tabline.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabline.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:12 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,8 +67,8 @@
#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -176,7 +176,7 @@ void SvxLineTabDialog::SavePalettes()
// Speichern der Tabellen, wenn sie geaendert wurden.
- const String aPath( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ const String aPath( SvtPathOptions().GetPalettePath() );
if( nDashListState & CT_MODIFIED )
{
diff --git a/svx/source/dialog/tpbitmap.cxx b/svx/source/dialog/tpbitmap.cxx
index 19b3c325ee5c..80b92a11279e 100644
--- a/svx/source/dialog/tpbitmap.cxx
+++ b/svx/source/dialog/tpbitmap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tpbitmap.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:12 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -88,8 +88,8 @@
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -859,7 +859,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sob" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
- String aFile( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ String aFile( SvtPathOptions().GetPalettePath() );
pFileDlg->SetPath( aFile );
if( pFileDlg->Execute() == RET_OK )
@@ -946,8 +946,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sob" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- INetURLObject aFile; aFile.SetSmartURL( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ INetURLObject aFile( SvtPathOptions().GetPalettePath(), INET_PROT_FILE );
if( pBitmapList->GetName().Len() )
{
diff --git a/svx/source/dialog/tpcolor.cxx b/svx/source/dialog/tpcolor.cxx
index 072a58791549..4d12e7c9533b 100644
--- a/svx/source/dialog/tpcolor.cxx
+++ b/svx/source/dialog/tpcolor.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tpcolor.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:13 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,8 +67,8 @@
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -765,7 +765,7 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soc" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
- String aFile( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ String aFile( SvtPathOptions().GetPalettePath() );
pFileDlg->SetPath( aFile );
if( pFileDlg->Execute() == RET_OK )
@@ -867,8 +867,7 @@ IMPL_LINK( SvxColorTabPage, ClickSaveHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soc" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- INetURLObject aFile; aFile.SetSmartURL( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ INetURLObject aFile( SvtPathOptions().GetPalettePath(), INET_PROT_FILE );
if( pColorTab->GetName().Len() )
{
diff --git a/svx/source/dialog/tpgradnt.cxx b/svx/source/dialog/tpgradnt.cxx
index ce2d51954b4e..05c8bad5fa28 100644
--- a/svx/source/dialog/tpgradnt.cxx
+++ b/svx/source/dialog/tpgradnt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tpgradnt.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:13 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,8 +75,8 @@
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -698,8 +698,7 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sog" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- String aFile( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ String aFile( SvtPathOptions().GetPalettePath() );
pFileDlg->SetPath( aFile );
if( pFileDlg->Execute() == RET_OK )
@@ -790,8 +789,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sog" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- INetURLObject aFile; aFile.SetSmartURL( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ INetURLObject aFile( SvtPathOptions().GetPalettePath(), INET_PROT_FILE );
if( pGradientList->GetName().Len() )
{
diff --git a/svx/source/dialog/tphatch.cxx b/svx/source/dialog/tphatch.cxx
index da6038daa224..5ea079580d07 100644
--- a/svx/source/dialog/tphatch.cxx
+++ b/svx/source/dialog/tphatch.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tphatch.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:13 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,8 +70,8 @@
#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -763,8 +763,7 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soh" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- String aFile( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ String aFile( SvtPathOptions().GetPalettePath() );
pFileDlg->SetPath( aFile );
if( pFileDlg->Execute() == RET_OK )
@@ -844,8 +843,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soh" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- INetURLObject aFile; aFile.SetSmartURL( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ INetURLObject aFile( SvtPathOptions().GetPalettePath(), INET_PROT_FILE );
if( pHatchingList->GetName().Len() )
{
diff --git a/svx/source/dialog/tplnedef.cxx b/svx/source/dialog/tplnedef.cxx
index 2802db95d24a..b346252c2671 100644
--- a/svx/source/dialog/tplnedef.cxx
+++ b/svx/source/dialog/tplnedef.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tplnedef.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:13 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,8 +70,8 @@
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -813,8 +813,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sod" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- String aFile( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ String aFile( SvtPathOptions().GetPalettePath() );
pFileDlg->SetPath( aFile );
if( pFileDlg->Execute() == RET_OK )
@@ -896,8 +895,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, p )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sod" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- INetURLObject aFile; aFile.SetSmartURL( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ INetURLObject aFile( SvtPathOptions().GetPalettePath(), INET_PROT_FILE );
if( pDashList->GetName().Len() )
{
diff --git a/svx/source/dialog/tplneend.cxx b/svx/source/dialog/tplneend.cxx
index ace2e70cf234..f580ef1a8030 100644
--- a/svx/source/dialog/tplneend.cxx
+++ b/svx/source/dialog/tplneend.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tplneend.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:13 $
+ * last change: $Author: pb $ $Date: 2000-09-26 06:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -71,8 +71,8 @@
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
#endif
-#ifndef _SFXINIMGR_HXX
-#include <svtools/iniman.hxx>
+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#include <svtools/pathoptions.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
@@ -604,8 +604,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soe" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- String aFile( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ String aFile( SvtPathOptions().GetPalettePath() );
pFileDlg->SetPath( aFile );
if( pFileDlg->Execute() == RET_OK )
@@ -683,8 +682,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soe" ) );
pFileDlg->AddFilter( aStrFilterType, aStrFilterType );
-
- INetURLObject aFile; aFile.SetSmartURL( SFX_APP()->GetAppIniManager()->Get( SFX_KEY_PALETTE_PATH ) );
+ INetURLObject aFile( SvtPathOptions().GetPalettePath(), INET_PROT_FILE );
if( pLineEndList->GetName().Len() )
{
generated by cgit (git 2.34.1) at 2025-02-06 19:32:22 +0000