summaryrefslogtreecommitdiff
path: root/desktop/Library_deploymentmisc.mk
blob: 93f66de60f26a22a9517137c02bbf919169d208c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
#  (initial developer)
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.

$(eval $(call gb_Library_Library,deploymentmisc))

$(eval $(call gb_Library_set_include,deploymentmisc,\
    $$(INCLUDE) \
    -I$(SRCDIR)/desktop/inc \
    -I$(SRCDIR)/desktop/source/deployment/inc \
))

$(eval $(call gb_Library_use_sdk_api,deploymentmisc))

$(eval $(call gb_Library_add_defs,deploymentmisc,\
    -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \
))

$(eval $(call gb_Library_use_libraries,deploymentmisc,\
    comphelper \
    cppu \
    cppuhelper \
    sal \
    tl \
    ucbhelper \
    utl \
    xmlscript \
	$(gb_UWINAPI) \
    $(gb_STDLIBS) \
))

ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_externals,deploymentmisc,\
    berkeleydb \
))
endif

ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
    desktop/source/deployment/misc/db \
))
endif

$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
    desktop/source/deployment/misc/dp_dependencies \
    desktop/source/deployment/misc/dp_descriptioninfoset \
    desktop/source/deployment/misc/dp_identifier \
    desktop/source/deployment/misc/dp_interact \
    desktop/source/deployment/misc/dp_misc \
    desktop/source/deployment/misc/dp_platform \
    desktop/source/deployment/misc/dp_resource \
    desktop/source/deployment/misc/dp_ucb \
    desktop/source/deployment/misc/dp_update \
    desktop/source/deployment/misc/dp_version \
    desktop/source/deployment/misc/lockfile \
))

# vim: set ts=4 sw=4 et:
e> -rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfentry.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xffont.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xffooterstyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfframestyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfindex.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xflist.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfliststyle.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfpagemaster.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfparastyle.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xftablestyle.hxx2
19 files changed, 34 insertions, 34 deletions
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index e39606098b65..505e0cb8fe5b 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -75,7 +75,7 @@ public:
explicit LwpFrame(LwpPlacableLayout* pLayout);
~LwpFrame();
void RegisterStyle(XFFrameStyle* pFrameStyle);
- void Parse(XFFrame* pXFFrame, sal_Int32 nPageNo = 0);
+ void Parse(XFFrame* pXFFrame, sal_Int32 nPageNo);
void XFConvert(XFContentContainer* pCont);
private:
void ApplyWrapType(XFFrameStyle* pFrameStyle);
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 3dd9a0fbe725..e2db72f0a505 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -182,7 +182,7 @@ public:
virtual bool IsUseOnAllEvenPages(){ return false;}
virtual bool IsUseOnAllOddPages(){ return false;}
virtual bool IsUseOnPage(){ return false;}
- virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/ = 0){ return -1;}
+ virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/) { return -1;}
bool IsMinimumHeight();
virtual bool IsForWaterMark(){ return false;}
virtual LwpPara* GetLastParaOfPreviousStory() { return nullptr; }
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index 8074c3bbc7a3..8b64f2f777c8 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -101,7 +101,7 @@ public:
void ConvertFillerPageText(XFContentContainer* pCont);
void ResetXFColumns();
LwpPageLayout* GetOddChildLayout();
- virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0) override;
+ virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber) override;
bool operator <(LwpPageLayout& Other);
LwpPara* GetPagePosition();
};
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index 5d7b0c9999eb..eba8bac66558 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -114,7 +114,7 @@ public:
/**
* @descr Set cell protected.
*/
- void SetProtect(bool protect=true);
+ void SetProtect(bool protect);
/**
* @descr Set cell column id.
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index 0131d0c8b46b..c85ce0689b15 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -97,13 +97,13 @@ public:
between the border and the top of the text.
* @param: indent value of the padding.
*/
- void SetPadding(double left, double right = -1, double top = -1, double bottom = -1);
+ void SetPadding(double left, double right, double top, double bottom);
/**
* @descr: Set alignment property of the cell.
* @param: eAlign alignment type,left,right,center or justify.
*/
- void SetAlignType(enumXFAlignType hori=enumXFAlignNone, enumXFAlignType vert = enumXFAlignBottom);
+ void SetAlignType(enumXFAlignType hori, enumXFAlignType vert);
/**
* @descr: The borders is complex,so you have to create one before use.
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index 0681be67e98c..d8a32aa8f2c7 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -86,7 +86,7 @@ public:
/**
* @descr Set drawing object border line.
*/
- void SetLineStyle(double width, XFColor color = XFColor(0,0,0));
+ void SetLineStyle(double width, XFColor color);
/**
* @descr Set drawing object dash border style.
@@ -101,17 +101,17 @@ public:
/**
* @descr Set drawing object area grid style.
*/
- void SetAreaLineStyle(enumXFAreaLineStyle style, sal_Int32 angle = 0, double space = 0.102, XFColor lineColor = XFColor(0,0,0));
+ void SetAreaLineStyle(enumXFAreaLineStyle style, sal_Int32 angle, double space, XFColor lineColor);
/**
* @descr Set drawing object arrow start style,only lines can have arrows.
*/
- void SetArrowStart(const OUString& start, double size=0.3);
+ void SetArrowStart(const OUString& start, double size);
/**
* @descr Set drawing object arrow end style,only lines can have arrows.
*/
- void SetArrowEnd(const OUString& end, double size=0.3);
+ void SetArrowEnd(const OUString& end, double size);
void SetFontWorkStyle(enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx
index c7c8fc224d07..dc904f944b43 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx
@@ -85,7 +85,7 @@ public:
/**
* @descr Set entry key. The keys is available only for enumXFEntryAlphabetical.
*/
- void SetKey(const OUString& key1, const OUString& key2="");
+ void SetKey(const OUString& key1, const OUString& key2);
/**
* @descr Set outline level. This is available for enumXFEntryTOC and enumXFEntryUserIndex.
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx
index 99d6095b8d48..3808e76aa790 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.hxx
@@ -154,7 +154,7 @@ public:
/**
* @descr Set whether font is italic.
*/
- void SetItalic(bool italic = true);
+ void SetItalic(bool italic);
/**
* @descr Set whether font is italic for asia locale.
@@ -169,7 +169,7 @@ public:
/**
* @descr Set font bold.
*/
- void SetBold(bool bold = true);
+ void SetBold(bool bold);
/**
* @descr Set font bold for asia locale.
diff --git a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
index c8cb895e13e9..dfc82da7517c 100644
--- a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
@@ -70,7 +70,7 @@ public:
{
}
- void SetMargins(double left = -1, double right = -1, double top = -1)
+ void SetMargins(double left, double right, double top)
{
if( left != -1 )
m_aMargin.SetLeft(left);
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index 6c1c5afbe12b..da6a6615ef0b 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -70,7 +70,7 @@ public:
public:
void SetMasterPage(const OUString& masterPage);
- void SetStartValue(sal_Int32 value=0);
+ void SetStartValue(sal_Int32 value);
void SetRestartOnPage();
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index 727fad5eb1fd..8e5edcee774b 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -89,12 +89,12 @@ public:
/**
* @descr: space between frame and paragraph text.
*/
- void SetMargins(double left, double right=-1,double top=-1, double bottom=-1);
+ void SetMargins(double left, double right, double top, double bottom);
/**
* @descr: space between frame and text inside frame.
*/
- void SetPadding(double left, double right=-1,double top=-1, double bottom=-1);
+ void SetPadding(double left, double right, double top, double bottom);