diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-06-15 05:50:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-12 16:11:58 +0100 |
| commit | dca437578e09ac00c6df8aa0b8908d4ae24188fe (patch) | |
| tree | e51cd055f95bd8e968c7cdfd17c28cf8e4ae9eb6 /odk | |
| parent | b30c970602b522dce958c521b26a5dfbb8aaacb4 (diff) | |
Custom Panel SDK Example Fixes
- Remove unused boost header
- OUT_DEPLOY_URL must be an URL
Both break building the example on Windows
(cherry picked from commit 8af699cb89d9477b13d8701266b7c1fdf9356cfa)
Change-Id: Iedc1b1d6d9493390cdf8b9055afe7c712c6bfc31
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/examples/cpp/custompanel/Makefile | 11 | ||||
| -rw-r--r-- | odk/examples/cpp/custompanel/ctp_panel.hxx | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/odk/examples/cpp/custompanel/Makefile b/odk/examples/cpp/custompanel/Makefile index 1e81c9b1e84e..95268db6ddea 100644 --- a/odk/examples/cpp/custompanel/Makefile +++ b/odk/examples/cpp/custompanel/Makefile @@ -36,10 +36,8 @@ COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_E COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components -COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_types.flag - # Allow deploying the extension when running it #this should be in odk/settings/std.mk @@ -47,12 +45,11 @@ OUT_DEPLOY=$(OUT)/deploy OUT_COMP_DEPLOY=$(OUT_DEPLOY)/$(COMP_NAME) OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY)) -OUT_DEPLOY_URL=$(URLPREFIX)$(subst \\,\,$(OUT_DEPLOY_DIR)) +OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY) ENV_USER_INSTALL=-env:"UserInstallation=$(OUT_DEPLOY_URL)" OFFICE_START_OPTIONS=-nologo -nofirststartwizard -norestore -writer OXT_DEPLOYEDFLAG=$(OUT_MISC)/cpp_$(COMP_NAME)_deployed_oxt.flag - CXXFILES = \ ctp_factory.cxx \ ctp_panel.cxx \ @@ -144,7 +141,6 @@ $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) WriterWindowState.xcu CalcW $(SDK_ZIP) -u $@ WriterWindowState.xcu CalcWindowState.xcu DrawWindowState.xcu ImpressWindowState.xcu Factories.xcu panel.png cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml - CustomToolPanelExample : $(COMP_PACKAGE) @echo -------------------------------------------------------------------------------- @echo Please use the following command to deploy the example! @@ -153,7 +149,6 @@ CustomToolPanelExample : $(COMP_PACKAGE) @echo - @echo -------------------------------------------------------------------------------- - CustomToolPanelExample.run: $(OXT_DEPLOYEDFLAG) "$(OFFICE_PROGRAM_PATH)$(PS)soffice" $(OFFICE_START_OPTIONS) $(ENV_USER_INSTALL) @@ -164,9 +159,6 @@ $(OXT_DEPLOYEDFLAG) : $(COMP_PACKAGE) $(DEPLOYTOOL) $(COMP_PACKAGE_URL) $(ENV_USER_INSTALL) @echo flagged > $(subst /,$(PS),$@) - - - .PHONY: clean clean : -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_INC)) @@ -174,7 +166,6 @@ clean : -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_SLO)) -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_DEPLOY_DIR)) -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMP_PACKAGE_URL))) - -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMP_REGISTERFLAG))) -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMP_TYPEFLAG))) -$(DEL) $(subst \\,\,$(subst /,$(PS),$(OXT_DEPLOYEDFLAG))) -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SHAREDLIB_OUT)/$(COMP_NAME).*)) diff --git a/odk/examples/cpp/custompanel/ctp_panel.hxx b/odk/examples/cpp/custompanel/ctp_panel.hxx index 5ef7f19742f2..8ef6aa5fc6e5 100644 --- a/odk/examples/cpp/custompanel/ctp_panel.hxx +++ b/odk/examples/cpp/custompanel/ctp_panel.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> -#include <boost/scoped_ptr.hpp> //...................................................................................................................... namespace sd { namespace colortoolpanel |