Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
161c3f17
Kaydet (Commit)
161c3f17
authored
Şub 14, 2012
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Some more comphelper/configurationhelper clean up
üst
00717e85
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
54 deletions
+14
-54
dbtools2.cxx
connectivity/source/commontools/dbtools2.cxx
+0
-1
treeopt.hxx
cui/source/inc/treeopt.hxx
+2
-7
optpath.cxx
cui/source/options/optpath.cxx
+7
-8
treeopt.cxx
cui/source/options/treeopt.cxx
+0
-0
app.cxx
desktop/source/app/app.cxx
+5
-38
No files found.
connectivity/source/commontools/dbtools2.cxx
Dosyayı görüntüle @
161c3f17
...
...
@@ -53,7 +53,6 @@
#include <tools/diagnose_ex.h>
#include <unotools/sharedunocomponent.hxx>
#include <comphelper/configurationhelper.hxx>
//.........................................................................
namespace
dbtools
...
...
cui/source/inc/treeopt.hxx
Dosyayı görüntüle @
161c3f17
...
...
@@ -138,7 +138,6 @@ struct LastPageSaver
// class OfaTreeOptionsDialog --------------------------------------------
namespace
com
{
namespace
sun
{
namespace
star
{
namespace
frame
{
class
XFrame
;
}
}
}
}
namespace
com
{
namespace
sun
{
namespace
star
{
namespace
container
{
class
XNameAccess
;
}
}
}
}
namespace
com
{
namespace
sun
{
namespace
star
{
namespace
lang
{
class
XMultiServiceFactory
;
}
}
}
}
namespace
com
{
namespace
sun
{
namespace
star
{
namespace
awt
{
class
XContainerWindowProvider
;
}
}
}
}
...
...
@@ -192,12 +191,8 @@ private:
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>&
xMFac
,
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
frame
::
XFrame
>&
xFrame
);
Module
*
LoadModule
(
const
rtl
::
OUString
&
rModuleIdentifier
,
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
container
::
XNameAccess
>&
xRoot
);
void
LoadNodes
(
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
container
::
XNameAccess
>&
xRoot
,
Module
*
pModule
,
Module
*
LoadModule
(
const
rtl
::
OUString
&
rModuleIdentifier
);
void
LoadNodes
(
Module
*
pModule
,
const
rtl
::
OUString
&
rExtensionId
,
VectorOfNodes
&
rOutNodeList
);
void
InsertNodes
(
const
VectorOfNodes
&
rNodeList
);
...
...
cui/source/options/optpath.cxx
Dosyayı görüntüle @
161c3f17
...
...
@@ -50,7 +50,7 @@
#include "optpath.hrc"
#include <cuires.hrc>
#include "helpid.hrc"
#include <comphelper/configuration
helper
.hxx>
#include <comphelper/configuration.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <com/sun/star/uno/Exception.hpp>
...
...
@@ -59,6 +59,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <officecfg/Office/Common.hxx>
#include "optHeaderTabListbox.hxx"
#include <readonlyimage.hxx>
#include <vcl/help.hxx>
...
...
@@ -532,13 +533,11 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder )
// Set configuration flag to notify file picker that it's necessary
// to take over the path provided.
Reference
<
XMultiServiceFactory
>
xFactory
(
::
comphelper
::
getProcessServiceFactory
()
);
::
comphelper
::
ConfigurationHelper
::
writeDirectKey
(
xFactory
,
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"org.openoffice.Office.Common/"
)),
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"Path/Info"
)),
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"WorkPathChanged"
)),
::
com
::
sun
::
star
::
uno
::
makeAny
(
true
),
::
comphelper
::
ConfigurationHelper
::
E_STANDARD
);
boost
::
shared_ptr
<
comphelper
::
ConfigurationChanges
>
batch
(
comphelper
::
ConfigurationChanges
::
create
());
officecfg
::
Office
::
Common
::
Path
::
Info
::
WorkPathChanged
::
set
(
true
,
batch
);
batch
->
commit
();
}
}
}
...
...
cui/source/options/treeopt.cxx
Dosyayı görüntüle @
161c3f17
This diff is collapsed.
Click to expand it.
desktop/source/app/app.cxx
Dosyayı görüntüle @
161c3f17
...
...
@@ -68,10 +68,10 @@
#include <toolkit/unohlp.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/componentcontext.hxx>
#include <comphelper/configurationhelper.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/confignode.hxx>
#include <unotools/moduleoptions.hxx>
#include <officecfg/Office/Recovery.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
#include <rtl/uri.hxx>
...
...
@@ -1117,47 +1117,14 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
void
Desktop
::
retrieveCrashReporterState
()
{
static
const
::
rtl
::
OUString
CFG_PACKAGE_RECOVERY
(
RTL_CONSTASCII_USTRINGPARAM
(
"org.openoffice.Office.Recovery/"
));
static
const
::
rtl
::
OUString
CFG_PATH_CRASHREPORTER
(
RTL_CONSTASCII_USTRINGPARAM
(
"CrashReporter"
));
static
const
::
rtl
::
OUString
CFG_ENTRY_ENABLED
(
RTL_CONSTASCII_USTRINGPARAM
(
"Enabled"
));
css
::
uno
::
Reference
<
css
::
lang
::
XMultiServiceFactory
>
xSMGR
=
::
comphelper
::
getProcessServiceFactory
();
sal_Bool
bEnabled
(
sal_False
);
if
(
xSMGR
.
is
()
)
{
css
::
uno
::
Any
aVal
=
::
comphelper
::
ConfigurationHelper
::
readDirectKey
(
xSMGR
,
CFG_PACKAGE_RECOVERY
,
CFG_PATH_CRASHREPORTER
,
CFG_ENTRY_ENABLED
,
::
comphelper
::
ConfigurationHelper
::
E_READONLY
);
aVal
>>=
bEnabled
;
}
_bCrashReporterEnabled
=
bEnabled
;
_bCrashReporterEnabled
=
officecfg
::
Office
::
Recovery
::
CrashReporter
::
Enabled
::
get
();
}
sal_Bool
Desktop
::
isUIOnSessionShutdownAllowed
()
{
static
const
::
rtl
::
OUString
CFG_PACKAGE_RECOVERY
(
RTL_CONSTASCII_USTRINGPARAM
(
"org.openoffice.Office.Recovery/"
));
static
const
::
rtl
::
OUString
CFG_PATH_SESSION
(
RTL_CONSTASCII_USTRINGPARAM
(
"SessionShutdown"
));
static
const
::
rtl
::
OUString
CFG_ENTRY_UIENABLED
(
RTL_CONSTASCII_USTRINGPARAM
(
"DocumentStoreUIEnabled"
));
css
::
uno
::
Reference
<
css
::
lang
::
XMultiServiceFactory
>
xSMGR
=
::
comphelper
::
getProcessServiceFactory
();
sal_Bool
bResult
=
sal_False
;
if
(
xSMGR
.
is
()
)
{
css
::
uno
::
Any
aVal
=
::
comphelper
::
ConfigurationHelper
::
readDirectKey
(
xSMGR
,
CFG_PACKAGE_RECOVERY
,
CFG_PATH_SESSION
,
CFG_ENTRY_UIENABLED
,
::
comphelper
::
ConfigurationHelper
::
E_READONLY
);
aVal
>>=
bResult
;
}
return
bResult
;
return
officecfg
::
Office
::
Recovery
::
SessionShutdown
::
DocumentStoreUIEnabled
::
get
();
}
//-----------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment