fpicker/Library_fps.mk | 4 ----
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 19 +++++++++++--------
writerfilter/Library_writerfilter.mk | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 57ebb84c1fdfc868cc01bd4b12e95ca043cda718
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Jul 24 00:29:11 2013 +0200
Revert "fdo#46037: no more comphelper/configurationhelper.hxx in fpicker"
This reverts commit 7cbf9c9e0a34937783dfa7f78d460dcf70504841.
Revert "Trying to fix the windows build"
This reverts commit d1f58e5ea695e823e931aad1bfb1d7b4bf17634c.
Change-Id: I67d00ec010a834e27b0e79b0afd92c5a2e7d47d6
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 4a1056a..c4b3e0e 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -10,10 +10,6 @@
$(eval $(call gb_Library_Library,fps))
-$(eval $(call gb_Library_use_custom_headers,fps,\
- officecfg/registry \
-))
-
$(eval $(call gb_Library_add_nativeres,fps,fps/Fps))
$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 1f204d6..2bf2e28 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -37,12 +37,12 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <osl/file.hxx>
#include <tchar.h>
-#include <officecfg/Office/Common.hxx>
#ifdef _MSC_VER
#pragma warning (push, 1)
@@ -215,15 +215,18 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const
OUString& sDirectory)
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
- bool bChanged =
officecfg::Office::Common::Path::Info::WorkPathChanged::get();
+ const OUString aPackage("org.openoffice.Office.Common/");
+ const OUString aRelPath("Path/Info");
+ const OUString aKey("WorkPathChanged");
- if (bChanged )
+ css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
+ comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey,
::comphelper::ConfigurationHelper::E_READONLY);
+
+ bool bChanged(false);
+ if (( aValue >>= bChanged ) && bChanged )
{
- boost::shared_ptr< comphelper::ConfigurationChanges > batch(
- comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Path::Info::WorkPathChanged::set(
- false, batch);
- batch->commit();
+ ::comphelper::ConfigurationHelper::writeDirectKey(
+ comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath,
aKey, css::uno::makeAny(false), ::comphelper::ConfigurationHelper::E_STANDARD);
}
RequestRef rRequest(new Request());
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 0f3bdb1..aaa2969 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_use_custom_headers,writerfilter,\
- officecfg/registry \
+ officecfg/registry \
oox/generated \
writerfilter/source \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
