bean/com/sun/star/comp/beans/LocalOfficeConnection.java
| 4 -
bean/qa/complex/bean/WriterFrame.java
| 2
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
| 6 -
framework/qa/complex/framework/autosave/Protocol.java
| 10 +--
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
| 2
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
| 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
| 8 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
| 32 +++++-----
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
| 8 +-
qadevOOo/runner/convwatch/HTMLOutputter.java
| 22 +++---
qadevOOo/runner/convwatch/StatusHelper.java
| 2
qadevOOo/runner/graphical/HTMLResult.java
| 8 +-
qadevOOo/runner/graphical/PerformanceContainer.java
| 2
qadevOOo/runner/util/DBTools.java
| 16 ++---
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
| 2
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
| 2
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
| 2
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
| 4 -
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
| 18 ++---
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
| 6 -
scripting/java/org/openoffice/idesupport/OfficeInstallation.java
| 2
scripting/java/org/openoffice/idesupport/SVersionRCFile.java
| 2
scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
| 2
swext/mediawiki/src/com/sun/star/wiki/Helper.java
| 2
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
| 2
swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
| 18 ++---
wizards/com/sun/star/wizards/common/NumericalHelper.java
| 22 +++---
wizards/com/sun/star/wizards/db/BlindtextCreator.java
| 2
wizards/com/sun/star/wizards/form/FormControlArranger.java
| 2
wizards/com/sun/star/wizards/form/FormWizard.java
| 2
wizards/com/sun/star/wizards/table/ScenarioSelector.java
| 4 -
wizards/com/sun/star/wizards/ui/PathSelection.java
| 8 +-
writerfilter/source/dmapper/DomainMapperTableManager.cxx
| 5 -
writerfilter/source/dmapper/DomainMapperTableManager.hxx
| 3
writerfilter/source/dmapper/DomainMapper_Impl.hxx
| 2
writerfilter/source/dmapper/StyleSheetTable.cxx
| 5 -
writerfilter/source/dmapper/StyleSheetTable.hxx
| 1
writerfilter/source/dmapper/TablePropertiesHandler.cxx
| 5 -
writerfilter/source/dmapper/TablePropertiesHandler.hxx
| 3
writerfilter/source/dmapper/TblStylePrHandler.cxx
| 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
| 10 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
| 12 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
| 4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
| 2
44 files changed, 137 insertions(+), 143 deletions(-)
New commits:
commit e701b3f732fa7f70cb273183e9ae8dbfd840f5e4
Author: Noel Grandin <n...@peralex.com>
Date: Fri Aug 8 11:14:08 2014 +0200
java: reduce scope, make constants private
found by UCDetector
Change-Id: Ide9975e361ed17ac8cdcbe67ba74c563a9392d57
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 1094a7b..93ac5bb 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -45,9 +45,9 @@ import com.sun.star.lib.util.NativeLibraryLoader;
public class LocalOfficeConnection
implements OfficeConnection
{
- public static final String OFFICE_APP_NAME = "soffice";
+ private static final String OFFICE_APP_NAME = "soffice";
public static final String OFFICE_LIB_NAME = "officebean";
- public static final String OFFICE_ID_SUFFIX = "_Office";
+ private static final String OFFICE_ID_SUFFIX = "_Office";
private Process mProcess;
private XComponentContext mContext;
diff --git a/bean/qa/complex/bean/WriterFrame.java
b/bean/qa/complex/bean/WriterFrame.java
index d1efaae..82448ef 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime;
class WriterFrame extends java.awt.Frame
{
com.sun.star.comp.beans.OOoBean m_bean;
- final static String m_sDocURL = "private:factory/swriter";
+ private final static String m_sDocURL = "private:factory/swriter";
/**
@param loadBeforeVisible
diff --git
a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index 2c0e616..3dc9470 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
@@ -27,10 +27,10 @@ public class NativeStorageAccess {
static { NativeLibraries.load(); }
public static final int READ = 1;
- public static final int SEEKABLE = 2;
- public static final int SEEKABLEREAD = 3;
+ private static final int SEEKABLE = 2;
+ private static final int SEEKABLEREAD = 3;
public static final int WRITE = 4;
- public static final int READWRITE = 7;
+ private static final int READWRITE = 7;
public static final int TRUNCATE = 8;
/** Creates a new instance of StorageAccess */
diff --git a/framework/qa/complex/framework/autosave/Protocol.java
b/framework/qa/complex/framework/autosave/Protocol.java
index b1acaa4..bcf3d40 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -55,8 +55,8 @@ public class Protocol extends JComponent
* @const TYPE_INFO this protocol line represent some
debug data for analyzing
*/
public static final int MODE_STDOUT = 1;
- public static final int MODE_STDERR = 2;
- public static final int MODE_ASCII = 4;
+ private static final int MODE_STDERR = 2;
+ private static final int MODE_ASCII = 4;
public static final int MODE_HTML = 8;
public static final int TYPE_OK = 1;
@@ -66,10 +66,10 @@ public class Protocol extends JComponent
public static final int TYPE_SCOPE_OPEN = 16;
public static final int TYPE_SCOPE_CLOSE = 32;
public static final int TYPE_TESTMARK = 64;
- public static final int TYPE_ERROR_INFO = 128;
+ private static final int TYPE_ERROR_INFO = 128;
public static final int TYPE_WARNING_INFO = 256;
- public static final int TYPE_STATISTIC = 512;
- public static final int TYPE_LINK = 1024;
+ private static final int TYPE_STATISTIC = 512;
+ private static final int TYPE_LINK = 1024;
public static final int FILTER_NONE = 0;
public static final int FILTER_OK = TYPE_OK;
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
index 8d3436a..3b233d7 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
@@ -27,7 +27,7 @@ import java.io.*;
import java.util.*;
public class GlobalString {
- public static final String NEGLECT_TAG = "#$@";
+ private static final String NEGLECT_TAG = "#$@";
public static final String EQUAL_TAG = "=";
/**
diff --git
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index eb1c577..67c2d26 100644
---
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -68,7 +68,7 @@ public class DialogComponent {
public static class _DialogComponent
implements XTypeProvider, XServiceInfo, XTestDialogHandler,
XDialogEventHandler {
- static final String __serviceName=
"com.sun.star.test.TestDialogHandler";
+ private static final String __serviceName=
"com.sun.star.test.TestDialogHandler";
static byte[] _implementationId;
private XComponentContext m_xCmpCtx;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 66481a6..92dcacb 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -68,10 +68,10 @@ public class DocumentView extends JFrame
* These command strings are used to identify a received action
* of buttons on which we listen for action events.
*/
- public static final String COMMAND_OPEN = "open" ;
- public static final String COMMAND_SAVE = "save" ;
- public static final String COMMAND_EXPORT = "export" ;
- public static final String COMMAND_EXIT = "exit" ;
+ private static final String COMMAND_OPEN = "open" ;
+ private static final String COMMAND_SAVE = "save" ;
+ private static final String COMMAND_EXPORT = "export" ;
+ private static final String COMMAND_EXIT = "exit" ;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
index 1b3289e..f34f6f9 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
@@ -67,11 +67,11 @@ public class StatusView extends JPanel
* const
* These URL's describe available feature states.
*/
- public static final String FEATUREURL_FONT = "slot:10007";
- public static final String FEATUREURL_SIZE = "slot:10015";
- public static final String FEATUREURL_BOLD = "slot:10009";
- public static final String FEATUREURL_ITALIC = "slot:10008";
- public static final String FEATUREURL_UNDERLINE = "slot:10014";
+ private static final String FEATUREURL_FONT = "slot:10007";
+ private static final String FEATUREURL_SIZE = "slot:10015";
+ private static final String FEATUREURL_BOLD = "slot:10009";
+ private static final String FEATUREURL_ITALIC = "slot:10008";
+ private static final String FEATUREURL_UNDERLINE = "slot:10014";
@@ -79,17 +79,17 @@ public class StatusView extends JPanel
* const
* These values are used to show current state of showed feature.
*/
- public static final String FONT_OFF = "unknown" ;
- public static final String SIZE_OFF = "0.0" ;
- public static final String BOLD_OFF = "-" ;
- public static final String ITALIC_OFF = "-" ;
- public static final String UNDERLINE_OFF = "-" ;
-
- public static final String FONT_ON = "" ;
- public static final String SIZE_ON = "" ;
- public static final String BOLD_ON = "X" ;
- public static final String ITALIC_ON = "X" ;
- public static final String UNDERLINE_ON = "X" ;
+ private static final String FONT_OFF = "unknown" ;
+ private static final String SIZE_OFF = "0.0" ;
+ private static final String BOLD_OFF = "-" ;
+ private static final String ITALIC_OFF = "-" ;
+ private static final String UNDERLINE_OFF = "-" ;
+
+ private static final String FONT_ON = "" ;
+ private static final String SIZE_ON = "" ;
+ private static final String BOLD_ON = "X" ;
+ private static final String ITALIC_ON = "X" ;
+ private static final String UNDERLINE_ON = "X" ;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index d709edd..bfbf3d1 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -78,12 +78,12 @@ public class AsciiReplaceFilter
// the supported service names, the first one being the service name
of the component itself
- public static final String[] m_serviceNames = {
"com.sun.star.comp.ansifilter.AsciiReplaceFilter" ,
"com.sun.star.document.ImportFilter", "com.sun.star.document.ExportFilter" };
+ private static final String[] m_serviceNames = {
"com.sun.star.comp.ansifilter.AsciiReplaceFilter" ,
"com.sun.star.document.ImportFilter", "com.sun.star.document.ExportFilter" };
// filterprocess states
- public static final int FILTERPROC_RUNS = 0;
- public static final int FILTERPROC_BREAK = 1;
- public static final int FILTERPROC_STOPPED = 2;
+ private static final int FILTERPROC_RUNS = 0;
+ private static final int FILTERPROC_BREAK = 1;
+ private static final int FILTERPROC_STOPPED = 2;
// member
diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java
b/qadevOOo/runner/convwatch/HTMLOutputter.java
index b749169..2dea50f 100644
--- a/qadevOOo/runner/convwatch/HTMLOutputter.java
+++ b/qadevOOo/runner/convwatch/HTMLOutputter.java
@@ -77,9 +77,9 @@ public class HTMLOutputter
}
}
- final static String TEST_TABLETITLE = "Test";
- final static String VISUAL_STATUS_TABLETITLE = "Visual status";
- final static String VISUAL_STATUS_MESSAGE_TABLETITLE = "Message";
+ private final static String TEST_TABLETITLE = "Test";
+ private final static String VISUAL_STATUS_TABLETITLE = "Visual status";
+ private final static String VISUAL_STATUS_MESSAGE_TABLETITLE = "Message";
public void indexSection(String _sOfficeInfo)
{
@@ -196,16 +196,16 @@ public class HTMLOutputter
return a.toString();
}
- final static String FIRSTGFX_TABLETITLE = "Original print file as jpeg";
- final static String SECONDGFX_TABLETITLE = "New print file as jpeg";
- final static String DIFFER_TABLETITLE = "Difference file";
- final static String STATUS_TABLETITLE = "Status";
- final static String PIXELDIFF_TABLETITLE = "Pixel difference in %";
+ private final static String FIRSTGFX_TABLETITLE = "Original print file as
jpeg";
+ private final static String SECONDGFX_TABLETITLE = "New print file as
jpeg";
+ private final static String DIFFER_TABLETITLE = "Difference file";
+ private final static String STATUS_TABLETITLE = "Status";
+ private final static String PIXELDIFF_TABLETITLE = "Pixel difference in %";
- final static String PIXELDIFF_BM_TABLETITLE = "P.diff. in % after remove
border";
- final static String DIFFER_BM_TABLETITLE = "Diff file (RB)";
+ private final static String PIXELDIFF_BM_TABLETITLE = "P.diff. in % after
remove border";
+ private final static String DIFFER_BM_TABLETITLE = "Diff file (RB)";
- final static String OK_TABLETITLE = "OK?";
+ private final static String OK_TABLETITLE = "OK?";
public void checkSection(String _sDocumentName)
{
try
diff --git a/qadevOOo/runner/convwatch/StatusHelper.java
b/qadevOOo/runner/convwatch/StatusHelper.java
index 46a8ff3..bb49450 100644
--- a/qadevOOo/runner/convwatch/StatusHelper.java
+++ b/qadevOOo/runner/convwatch/StatusHelper.java
@@ -20,7 +20,7 @@ package convwatch;
public class StatusHelper
{
- final static public int DIFF_NOT_REALLY_INITIALISED = 1;
+ final static private int DIFF_NOT_REALLY_INITIALISED = 1;
final static public int DIFF_NO_DIFFERENCES = 2;
final static public int DIFF_DIFFERENCES_FOUND = 3;
final static public int DIFF_AFTER_MOVE_DONE_NO_PROBLEMS = 4;
diff --git a/qadevOOo/runner/graphical/HTMLResult.java
b/qadevOOo/runner/graphical/HTMLResult.java
index e170ec6..6d6ecb1 100644
--- a/qadevOOo/runner/graphical/HTMLResult.java
+++ b/qadevOOo/runner/graphical/HTMLResult.java
@@ -86,10 +86,10 @@ public class HTMLResult
flush();
}
- final static String TEST_TABLETITLE = "Document";
- final static String VISUAL_STATUS_TABLETITLE = "Visual status";
- final static String VISUAL_STATUS_MESSAGE_TABLETITLE = "Message";
- final static String FIRSTGFX_TABLETITLE = "Original print file as jpeg";
+ private final static String TEST_TABLETITLE = "Document";
+ private final static String VISUAL_STATUS_TABLETITLE = "Visual status";
+ private final static String VISUAL_STATUS_MESSAGE_TABLETITLE = "Message";
+ private final static String FIRSTGFX_TABLETITLE = "Original print file as
jpeg";
public void indexSection(String _sOfficeInfo)
{
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java
b/qadevOOo/runner/graphical/PerformanceContainer.java
index f4b4b4e..32eaac7 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -69,7 +69,7 @@ public class PerformanceContainer /* extends *//* implements
*/ {
final static int StoreAsPDF = 4;
final static int OfficeStop = 5;
final static int AllTime = 6;
- final static int LAST_VALUE = 7; // THIS MUST BE ALWAYS THE LAST AND THE
BIGGEST VALUE!
+ private final static int LAST_VALUE = 7; // THIS MUST BE ALWAYS THE LAST
AND THE BIGGEST VALUE!
private long m_nTime[];
private String m_sMSOfficeVersion;
diff --git a/qadevOOo/runner/util/DBTools.java
b/qadevOOo/runner/util/DBTools.java
index 377b6ea..2514062 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -64,19 +64,19 @@ public class DBTools {
// constants for TestDB table column indexes
public final static int TST_STRING = 1 ;
public final static int TST_INT = 2 ;
- public final static int TST_DOUBLE = 5 ;
- public final static int TST_DATE = 6 ;
- public final static int TST_BOOLEAN = 10 ;
- public final static int TST_CHARACTER_STREAM = 11 ;
- public final static int TST_BINARY_STREAM = 12 ;
+ private final static int TST_DOUBLE = 5 ;
+ private final static int TST_DATE = 6 ;
+ private final static int TST_BOOLEAN = 10 ;
+ private final static int TST_CHARACTER_STREAM = 11 ;
+ private final static int TST_BINARY_STREAM = 12 ;
// constants for TestDB columns names
public final static String TST_STRING_F = "_TEXT" ;
public final static String TST_INT_F = "_INT" ;
public final static String TST_DOUBLE_F = "_DOUBLE" ;
public final static String TST_DATE_F = "_DATE" ;
- public final static String TST_BOOLEAN_F = "_BOOL" ;
- public final static String TST_CHARACTER_STREAM_F = "_MEMO1" ;
+ private final static String TST_BOOLEAN_F = "_BOOL" ;
+ private final static String TST_CHARACTER_STREAM_F = "_MEMO1" ;
public final static String TST_BINARY_STREAM_F = "_MEMO2" ;
/**
@@ -98,7 +98,7 @@ public class DBTools {
* Array of lengths of streams for each row in of the
* <code>TST_TABLE_VALUES</code> constants.
*/
- public final static int[] TST_STREAM_LENGTHS = {0, 0, 0} ;
+ private final static int[] TST_STREAM_LENGTHS = {0, 0, 0} ;
/**
* It's just a structure with some useful methods for representing
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
index 2976adf..e73c263 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
@@ -41,7 +41,7 @@ public class PentahoReportEngineMetaData
public static final String OPENDOCUMENT_TEXT =
"application/vnd.oasis.opendocument.text";
public static final String OPENDOCUMENT_SPREADSHEET =
"application/vnd.oasis.opendocument.spreadsheet";
public static final String OPENDOCUMENT_CHART =
"application/vnd.oasis.opendocument.chart";
- public final static String CONTENT_TYPE = "content-type";
+ private final static String CONTENT_TYPE = "content-type";
public static final String DEBUG = "raw/text+xml";
private final Set<String> mandatoryParameters;
private final Map<String,Class<?>> parameterTypes;
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index 679421c..f15f381 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -38,7 +38,7 @@ public abstract class AbstractReportElementLayoutController
extends AbstractLayoutController
{
- public static final int NOT_STARTED = 0;
+ private static final int NOT_STARTED = 0;
public static final int FINISHED = 2;
private int state;
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index e775c11..8eecd85 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -58,7 +58,7 @@ public class FormatValueUtility
private static final String BOOLEAN_VALUE = "boolean-value";
private static final String STRING_VALUE = "string-value";
public static final String VALUE_TYPE = "value-type";
- public static final String VALUE = "value";
+ private static final String VALUE = "value";
private static SimpleDateFormat dateFormat;
private static SimpleDateFormat timeFormat;
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index bfe50b8..ca877c3 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -42,8 +42,8 @@ public class OfficeGroupLayoutController extends
SectionLayoutController
implements OfficeRepeatingStructureLayoutController
{
- public static final int STATE_PROCESS_REPEATING_HEADER = 0;
- public static final int STATE_PROCESS_REPEATING_FOOTER = 1;
+ private static final int STATE_PROCESS_REPEATING_HEADER = 0;
+ private static final int STATE_PROCESS_REPEATING_FOOTER = 1;
public static final int STATE_PROCESS_NORMAL_FLOW = 3;
private boolean waitForJoin;
private int state;
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 0c012a5..3adb42d 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -116,7 +116,7 @@ public abstract class OfficeDocumentReportTarget extends
AbstractReportTarget
protected static final Log LOGGER =
LogFactory.getLog(OfficeDocumentReportTarget.class);
public static final String HORIZONTAL_POS = "horizontal-pos";
public static final String TAG_DEF_PREFIX =
"org.libreoffice.report.pentaho.output.";
- public static final int ROLE_NONE = 0;
+ private static final int ROLE_NONE = 0;
public static final int ROLE_REPORT_HEADER = 1;
public static final int ROLE_REPORT_FOOTER = 2;
public static final int ROLE_GROUP_HEADER = 3;
@@ -130,14 +130,14 @@ public abstract class OfficeDocumentReportTarget extends
AbstractReportTarget
public static final int ROLE_TEMPLATE = 11;
public static final int ROLE_SPREADSHEET_PAGE_HEADER = 12;
public static final int ROLE_SPREADSHEET_PAGE_FOOTER = 13;
- public static final int STATE_IN_DOCUMENT = 0;
- public static final int STATE_IN_BODY = 1;
- public static final int STATE_IN_CONTENT = 2;
- public static final int STATE_IN_GROUP = 3;
- public static final int STATE_IN_GROUP_BODY = 4;
- public static final int STATE_IN_SECTION = 5;
- public static final int STATE_IN_OTHER = 6;
- public static final int STATE_IN_GROUP_INSTANCE = 7;
+ private static final int STATE_IN_DOCUMENT = 0;
+ private static final int STATE_IN_BODY = 1;
+ private static final int STATE_IN_CONTENT = 2;
+ private static final int STATE_IN_GROUP = 3;
+ private static final int STATE_IN_GROUP_BODY = 4;
+ private static final int STATE_IN_SECTION = 5;
+ private static final int STATE_IN_OTHER = 6;
+ private static final int STATE_IN_GROUP_INSTANCE = 7;
public static final String FAILED = "Failed";
public static final String VERTICAL_POS = "vertical-pos";
private static final String ZERO_CM = "0cm";
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 3dd54d5..d3266a3 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -33,9 +33,9 @@ import com.sun.star.script.framework.log.LogUtils;
public class ScriptContext extends PropertySet implements XScriptContext
{
- public final static String HM_DOC_REF = "DocumentReference";
- public final static String HM_DESKTOP = "Desktop";
- public final static String HM_COMPONENT_CONTEXT = "ComponentContext";
+ private final static String HM_DOC_REF = "DocumentReference";
+ private final static String HM_DESKTOP = "Desktop";
+ private final static String HM_COMPONENT_CONTEXT = "ComponentContext";
private final static String DOC_URI = "SCRIPTING_DOC_URI";
diff --git a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
index abc08bf..d8b337f 100644
--- a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
@@ -27,7 +27,7 @@ public class OfficeInstallation implements
java.io.Serializable {
private String url;
private boolean hasFW = false;
- public static final String FILE_URL_PREFIX =
SVersionRCFile.FILE_URL_PREFIX;
+ private static final String FILE_URL_PREFIX =
SVersionRCFile.FILE_URL_PREFIX;
public OfficeInstallation(String path) {
this(path, path);
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index 94389e5..42cd8f0 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -30,7 +30,7 @@ import java.util.StringTokenizer;
public class SVersionRCFile {
- public static final String DEFAULT_NAME =
+ private static final String DEFAULT_NAME =
System.getProperty("os.name").startsWith("Windows") == true ?
System.getProperty("user.home") + File.separator +
"Application Data" + File.separator + "sversion.ini" :
diff --git a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
index c231a31..36380a2 100644
--- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
+++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
@@ -29,7 +29,7 @@ import org.openoffice.idesupport.xml.Manifest;
public class ParcelZipper
{
public static final String PARCEL_PREFIX_DIR = "Scripts/";
- public static final String PARCEL_EXTENSION = "sxp";
+ private static final String PARCEL_EXTENSION = "sxp";
public static final String CONTENTS_DIRNAME = "Contents";
public static final String PARCEL_DESCRIPTOR_XML = "parcel-descriptor.xml";
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 52800a1..5cdedf4 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -107,7 +107,7 @@ public class Helper
public final static int DLG_MEDIAWIKIEXTENSION_STRING = 31;
public final static int DLG_WIKIPAGEEXISTS_LABEL1 = 32;
- public final static int STRINGS_NUM = 33;
+ private final static int STRINGS_NUM = 33;
private final static String[] m_pEntryNames = { "GeneralSendError",
"NoWikiFilter",
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index c5accfa..83980c0 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -57,7 +57,7 @@ public final class WikiEditorImpl extends WeakBase
public static final String[] supportedServiceNames =
{"com.sun.star.frame.ProtocolHandler"};
public static final Class implementationClass = WikiEditorImpl.class;
// protocol name that this protocol handler handles
- public static final String protocolName = "vnd.com.sun.star.wiki:";
+ private static final String protocolName = "vnd.com.sun.star.wiki:";
private final XComponentContext m_xContext;
private Map<String, com.sun.star.frame.XStatusListener> m_statusListeners
= new HashMap<String, com.sun.star.frame.XStatusListener>();
diff --git
a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 2ec2b33..417308c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -39,15 +39,15 @@ public final class WikiOptionsEventHandlerImpl extends
WeakBase
static final String[] m_pServiceNames = {
"com.sun.star.wiki.WikiOptionsEventHandler" };
static final String m_sImplementationName =
WikiOptionsEventHandlerImpl.class.getName();
- static final String sExternalEvent = "external_event";
- static final String sAdd = "Add";
- static final String sEdit = "Edit";
- static final String sRemove = "Remove";
- static final String sListStatus = "ListStatus";
- static final String sListEdit = "ListEdit";
- static final String sInitialize = "initialize";
- static final String sOk = "ok";
- static final String sBack = "back";
+ private static final String sExternalEvent = "external_event";
+ private static final String sAdd = "Add";
+ private static final String sEdit = "Edit";
+ private static final String sRemove = "Remove";
+ private static final String sListStatus = "ListStatus";
+ private static final String sListEdit = "ListEdit";
+ private static final String sInitialize = "initialize";
+ private static final String sOk = "ok";
+ private static final String sBack = "back";
private XComponentContext m_xContext;
private XDialog m_xDialog;
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java
b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index dd569de..58f53d8 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -33,17 +33,17 @@ import com.sun.star.uno.TypeClass;
public class NumericalHelper
{
- public static final int UNKNOWN_TYPE = -32768;
- public static final int BYTE_TYPE = 0;
- public static final int SHORT_TYPE = 1;
- public static final int INT_TYPE = 2;
- public static final int LONG_TYPE = 3;
- public static final int FLOAT_TYPE = 4;
- public static final int DOUBLE_TYPE = 5;
- public static final int CHAR_TYPE = 6;
- public static final int STRING_TYPE = -1;
- public static final int BOOLEAN_TYPE = -2;
- public static final int SEQUENCE_TYPE = -3;
+ private static final int UNKNOWN_TYPE = -32768;
+ private static final int BYTE_TYPE = 0;
+ private static final int SHORT_TYPE = 1;
+ private static final int INT_TYPE = 2;
+ private static final int LONG_TYPE = 3;
+ private static final int FLOAT_TYPE = 4;
+ private static final int DOUBLE_TYPE = 5;
+ private static final int CHAR_TYPE = 6;
+ private static final int STRING_TYPE = -1;
+ private static final int BOOLEAN_TYPE = -2;
+ private static final int SEQUENCE_TYPE = -3;
public static final int ASCII_VALUE_0 = 48;
public static final int ASCII_VALUE_A = 65;
public static final int COUNT_CHARS_IN_ALPHABET = 26;
diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java
b/wizards/com/sun/star/wizards/db/BlindtextCreator.java
index 6f532f1..0d79f45 100644
--- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java
+++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java
@@ -23,7 +23,7 @@ import com.sun.star.wizards.common.PropertyNames;
public class BlindtextCreator
{
- public static final String BlindText =
+ private static final String BlindText =
"Ut wisi enim ad minim veniam, quis nostrud exerci tation " +
"ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis
autem vel eum iriure dolor " + "in hendrerit in vulputate velit esse molestie
consequat, vel illum dolore eu feugiat nulla facilisis at " + "vero et accumsan
et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis
dolore " + "te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer
adipiscing elit, sed diam nonummy " + "nibh euismod tincidunt ut laoreet dolore
magna aliquam erat volutpat. Ut wisi enim ad minim veniam, " + "quis nostrud
exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
consequat. " + "Duis autem vel eum iriure dolor in hendrerit in vulputate velit
esse molestie consequat, vel illum " + "dolore eu feugiat nulla facilisis at
vero et accumsan et iusto odio dignissim qui blandit praesent " + "luptatum
zzril delenit augue duis dolore te feugait nulla facilisi. Nam li
ber tempor cum soluta nobis " + "eleifend option congue nihil imperdiet doming
id quod mazim placerat facer possim assum.";
public static String adjustBlindTextlength(String FieldTitle, int
FieldWidth, boolean bIsCurLandscape, boolean bIsGroupTable, String[]
_RecordFieldNames)
diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java
b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index 1527c06..d5ddf3f 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java
@@ -38,7 +38,7 @@ import com.sun.star.wizards.document.TimeStampControl;
public class FormControlArranger
{
- public static final String LABELCONTROL = "LabelControl";
+ private static final String LABELCONTROL = "LabelControl";
protected DatabaseControl[] DBControlList = null;
private XNameContainer xFormName;
private XMultiServiceFactory xMSF;
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java
b/wizards/com/sun/star/wizards/form/FormWizard.java
index edcb8c3e3..d635139 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -47,7 +47,7 @@ public class FormWizard extends DatabaseObjectWizard
private static String slblSelFields;
private String sShowBinaryFields = PropertyNames.EMPTY_STRING;
private String serrFormNameexists = PropertyNames.EMPTY_STRING;
- public static final int SOMAIN_PAGE = 1;
+ private static final int SOMAIN_PAGE = 1;
public static final int SOSUBFORM_PAGE = 2;
public static final int SOSUBFORMFIELDS_PAGE = 3;
public static final int SOFIELDLINKER_PAGE = 4;
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 67cd319..77e063e 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -44,8 +44,8 @@ import com.sun.star.wizards.ui.XFieldSelectionListener;
*/
public class ScenarioSelector extends FieldSelection implements XItemListener,
XFieldSelectionListener
{
- final static int PRIVATE = 0;
- final static int BUSINESS = 1;
+ private final static int PRIVATE = 0;
+ private final static int BUSINESS = 1;
private XFixedText lblExplanation;
private XFixedText lblCategories;
diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java
b/wizards/com/sun/star/wizards/ui/PathSelection.java
index 4210383..7ccf5f7 100644
--- a/wizards/com/sun/star/wizards/ui/PathSelection.java
+++ b/wizards/com/sun/star/wizards/ui/PathSelection.java
@@ -41,15 +41,15 @@ public class PathSelection
public static class DialogTypes
{
- public static final int FOLDER = 0;
- public static final int FILE = 1;
+ private static final int FOLDER = 0;
+ private static final int FILE = 1;
}
public static class TransferMode
{
- public static final int SAVE = 0;
- public static final int LOAD = 1;
+ private static final int SAVE = 0;
+ private static final int LOAD = 1;
}
public PathSelection(XMultiServiceFactory xMSF, UnoDialog2 CurUnoDialog,
int TransferMode, int DialogType)
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 53d5202..529b1cf9 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -151,14 +151,14 @@ public class ParaStyle extends Style implements Cloneable
{
/** The bottom margin property. */
public static final int MARGIN_BOTTOM = 3;
/** Indent left property. */
- public static final int TEXT_INDENT = 4;
+ private static final int TEXT_INDENT = 4;
/** Indent right property. */
- public static final int LINE_HEIGHT = 5;
+ private static final int LINE_HEIGHT = 5;
/** Align text property. */
- public static final int TEXT_ALIGN = 6;
+ private static final int TEXT_ALIGN = 6;
// This must always be one more than highest property
/** Total number of properties. */
- protected static final int NR_PROPERTIES = 7;
+ private static final int NR_PROPERTIES = 7;
/**
* Array of flags indicating which attributes are set for this
@@ -203,7 +203,7 @@ public class ParaStyle extends Style implements Cloneable {
/** Line height minimum value. */
public static final int LH_ATLEAST = 0x20000000;
/** Line height mask. */
- public static final int LH_VALUEMASK = 0x00FFFFFF;
+ private static final int LH_VALUEMASK = 0x00FFFFFF;
/** Ignored tags. */
private static String[] ignored = {
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 3f9e6b9..5024d8f 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -37,17 +37,17 @@ public class TextStyle extends Style implements Cloneable {
final protected static int FIRST_ATTR = 0x01;
/** Indicates <i>bold</i> text. */
- final public static int BOLD = 0x01;
+ final private static int BOLD = 0x01;
/** Indicates <i>italic</i> text. */
- final public static int ITALIC = 0x02;
+ final private static int ITALIC = 0x02;
/** Indicates <i>underlined</i> text. */
- final public static int UNDERLINE = 0x04;
+ final private static int UNDERLINE = 0x04;
/** Indicates <i>strike-through</i> in the text. */
- final public static int STRIKETHRU = 0x08;
+ final private static int STRIKETHRU = 0x08;
/** Indicates <i>superscripted</i> text. */
- final public static int SUPERSCRIPT = 0x10;
+ final private static int SUPERSCRIPT = 0x10;
/** Indicates <i>subscripted</i> text. */
- final public static int SUBSCRIPT = 0x20;
+ final private static int SUBSCRIPT = 0x20;
/** Indicates the last attribute. */
final protected static int LAST_ATTR = 0x20;
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
index b5d3a13..05b078c 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
@@ -47,8 +47,8 @@ public class SheetSettings implements OfficeConstants {
private int paneNumber = 2;
final public static int NONE = 0x00;
- final public static int SPLIT = 0x01;
- final public static int FREEZE = 0x02;
+ final private static int SPLIT = 0x01;
+ final private static int FREEZE = 0x02;
/**
* Default Constructor for a <code>SheetSettings</code>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index b476ea3..a04f72c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -50,7 +50,7 @@ public final class Debug {
public final static int TRACE = 0x0004;
/** To set a flag. */
- public final static boolean SET = true;
+ private final static boolean SET = true;
/** To unset a flag. */
public final static boolean UNSET = false;
commit cc4d76145f7b92992b885cdc58b4534e8c024ac5
Author: Noel Grandin <n...@peralex.com>
Date: Tue Aug 12 11:33:51 2014 +0200
-Werror,-Wunused-private-field
Change-Id: I4632e78feb9ad7cae91427bd99bb48e980c06f03
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 75eeb61..2afeba8 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, DomainMapper&
rDMapper) :
+DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
@@ -51,7 +51,6 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML, DomainMapper& rD
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bOOXML( bOOXML ),
- m_rDMapper( rDMapper ),
m_aTmpPosition(),
m_aTmpTableProperties(),
m_bPushCurrentWidth(false),
@@ -60,7 +59,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML, DomainMapper& rD
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
m_nMaxFixedWidth(0),
- m_pTablePropsHandler( new TablePropertiesHandler( bOOXML, rDMapper ) )
+ m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index dfb8944..e810a89 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -47,7 +47,6 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1
then the repeating stops
sal_Int32 m_nTableWidth; //might be set directly or has to be
calculated from the column positions
bool m_bOOXML;
- DomainMapper& m_rDMapper;
OUString m_sTableStyleName;
/// Grab-bag of table look attributes for preserving.
comphelper::SequenceAsHashMap m_aTableLook;
@@ -79,7 +78,7 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
public:
- DomainMapperTableManager(bool bOOXML, DomainMapper& rDMapper);
+ DomainMapperTableManager(bool bOOXML);
virtual ~DomainMapperTableManager();
// use this method to avoid adding the properties for the table
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 8ec93fe..2bb0478 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -676,7 +676,7 @@ public:
void appendTableManager( )
{
boost::shared_ptr< DomainMapperTableManager > pMngr(
- new DomainMapperTableManager( m_eDocumentType ==
DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF, m_rDMapper ));
+ new DomainMapperTableManager( m_eDocumentType ==
DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF ));
m_aTableManagers.push( pMngr );
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 3d71739..50e9b7e 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -382,8 +382,7 @@ StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper,
bool const bIsNewDoc)
: LoggedProperties(dmapper_logger, "StyleSheetTable")
, LoggedTable(dmapper_logger, "StyleSheetTable")
-, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) ),
-m_rDMapper( rDMapper )
+, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) )
{
}
@@ -748,7 +747,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
if (!m_pImpl->m_pCurrentEntry)
break;
- TablePropertiesHandlerPtr pTblHandler( new
TablePropertiesHandler( true, m_rDMapper ) );
+ TablePropertiesHandlerPtr pTblHandler( new
TablePropertiesHandler( true ) );
pTblHandler->SetProperties(
m_pImpl->m_pCurrentEntry->pProperties );
if ( !pTblHandler->sprm( rSprm ) )
{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 7bc40a3..43b3b43 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -86,7 +86,6 @@ class StyleSheetTable :
public LoggedTable
{
StyleSheetTable_Impl *m_pImpl;
- DomainMapper & m_rDMapper;
public:
StyleSheetTable( DomainMapper& rDMapper,
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index e2d3031..8581ac0 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -41,11 +41,10 @@ using namespace oox;
namespace writerfilter {
namespace dmapper {
- TablePropertiesHandler::TablePropertiesHandler( bool bOOXML, DomainMapper&
rDMapper ) :
+ TablePropertiesHandler::TablePropertiesHandler( bool bOOXML ) :
m_pCurrentInteropGrabBag(0),
m_pTableManager( NULL ),
- m_bOOXML( bOOXML ),
- m_rDMapper( rDMapper )
+ m_bOOXML( bOOXML )
{
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index a4588e0..ed41c64 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -45,10 +45,9 @@ private:
std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
DomainMapperTableManager_Base_t *m_pTableManager;
bool m_bOOXML;
- DomainMapper& m_rDMapper;
public:
- TablePropertiesHandler( bool bOOXML, DomainMapper& rDMapper );
+ TablePropertiesHandler( bool bOOXML );
virtual ~TablePropertiesHandler( );
bool sprm(Sprm & sprm);
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 0acccd6..24fee7d 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -33,7 +33,7 @@ namespace dmapper {
TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) :
LoggedProperties(dmapper_logger, "TblStylePrHandler"),
m_rDMapper( rDMapper ),
-m_pTablePropsHandler( new TablePropertiesHandler( true, rDMapper ) ),
+m_pTablePropsHandler( new TablePropertiesHandler( true ) ),
m_nType( TBL_STYLE_UNKNOWN ),
m_pProperties( new PropertyMap )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
