[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - 2 commits - include/oox odk/examples odk/settings oox/source

[Vasily Melenchuk (via logerrit)]

 include/oox/crypto/DocumentEncryption.hxx        |    4 ++--
 odk/examples/cpp/complextoolbarcontrols/Makefile |    6 +++---
 odk/settings/settings.mk                         |    5 +++++
 oox/source/crypto/DocumentEncryption.cxx         |    2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 36d546b8279c88b609415029bd59991db51358ad
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Thu Oct 17 11:09:21 2019 +0300
Commit:     Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Thu Oct 17 11:09:21 2019 +0300

    oox: fixed build error, more consts
    
    Change-Id: I06b9885ca304c30d6160f43558b309539d4202c0

diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index d33450a3b791..c99cadc972f4 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -33,14 +33,14 @@ private:
     css::uno::Reference< css::io::XStream > mxDocumentStream;
     oox::ole::OleStorage& mrOleStorage;
     css::uno::Reference< css::packages::XPackageEncryption > mxPackageEncryption;
-    css::uno::Sequence< css::beans::NamedValue >& mMediaEncData;
+    const css::uno::Sequence< css::beans::NamedValue >& mMediaEncData;
     css::uno::Reference< css::uno::XComponentContext > mxContext;
 
 public:
     DocumentEncryption(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         css::uno::Reference< css::io::XStream > const & xDocumentStream,
         oox::ole::OleStorage& rOleStorage,
-        css::uno::Sequence< css::beans::NamedValue >& rMediaEncData);
+        const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData);
 
     bool encrypt();
 
diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx
index 2f0457911aed..70b7f2a3a4e9 100644
--- a/oox/source/crypto/DocumentEncryption.cxx
+++ b/oox/source/crypto/DocumentEncryption.cxx
@@ -28,7 +28,7 @@ using namespace css::beans;
 DocumentEncryption::DocumentEncryption(const Reference< XComponentContext >& rxContext,
                                        Reference<XStream> const & xDocumentStream,
                                        oox::ole::OleStorage& rOleStorage,
-                                       Sequence<NamedValue>& rMediaEncData)
+                                       const Sequence<NamedValue>& rMediaEncData)
     : mxContext(rxContext)
     , mxDocumentStream(xDocumentStream)
     , mrOleStorage(rOleStorage)
commit a65d79e1ce391fefea0beef2fb172b3af39c8459
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Tue Oct 15 15:07:10 2019 +0300
Commit:     Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Thu Oct 17 00:25:37 2019 +0300

    odk: fix for change directory in complextoolbarcontrols sample
    
    On Windows classical "cd" command does not change drive automatically.
    So if OO_SDK_OUT folder contained on another drive than SDK_HOME we
    will receive confusing buid errors.
    
    To avoid this for Windows configuration we should use "cd /d".
    
    Change-Id: I22908d49fc915d3a834972357934349ba82bbec5

diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile
index 446b06e50e15..ad75987cfab0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -142,10 +142,10 @@ $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.
 	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
-	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components description.xml
-	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
+	$(CD) $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components description.xml
+	$(CD) $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
 	$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png
-	cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
+	$(CD) $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
 
 $(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
 ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 25b31cd68fac..49e8f18e51a1 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -59,6 +59,7 @@ CAT=type
 OBJ_EXT=obj
 EXE_EXT=.exe
 COPY=copy
+CD=cd /d
 SHAREDLIB_EXT=dll
 SHAREDLIB_OUT=$(OUT_BIN)
 UNOPKG_PLATFORM=Windows
@@ -191,6 +192,7 @@ P2BG=&
 DEL=rm -f
 DELRECURSIVE=rm -rf
 COPY=cp
+CD=cd
 URLPREFIX=file://
 
 COMID=gcc3
@@ -334,6 +336,7 @@ P2BG=&
 DEL=rm -f
 DELRECURSIVE=rm -rf
 COPY=cp
+CD=cd
 URLPREFIX=file://
 
 SALLIB=-luno_sal
@@ -433,6 +436,7 @@ P2BG=&
 DEL=rm -f
 DELRECURSIVE=rm -rf
 COPY=cp
+CD=cd
 URLPREFIX=file://
 
 SALLIB=-luno_sal
@@ -543,6 +547,7 @@ P2BG=&
 DEL=rm -f
 DELRECURSIVE=rm -rf
 COPY=cp
+CD=cd
 URLPREFIX=file://
 
 SALLIB=-luno_sal