summaryrefslogtreecommitdiff
path: root/wizards/com/sun/star/wizards/reportbuilder
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2011-03-10 12:59:15 +0100
committerOcke Janssen <oj@openoffice.org>2011-03-10 12:59:15 +0100
commit27ef3ca46b4a2cf3963a5bc012b9d8278653c8ac (patch)
tree6c2ad51d24704ca3df6c1e4a89baf054d7e60f5e /wizards/com/sun/star/wizards/reportbuilder
parent3cbf819cef381f0c5137aac3e48d398d25065178 (diff)
dba34d: remove unnescessary casts
Diffstat (limited to 'wizards/com/sun/star/wizards/reportbuilder')
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java12
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java12
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java65
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java3
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java3
12 files changed, 49 insertions, 67 deletions
diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index 0e9945912425..0b55936da3fb 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -107,8 +107,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
public XWindowPeer getWizardParent()
{
- final XWindowPeer aWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, getFrame().getComponentWindow());
- return aWindowPeer;
+ return UnoRuntime.queryInterface(XWindowPeer.class, getFrame().getComponentWindow());
}
private XFrame m_xFrame = null;
// private ReportBuilderLayouter m_aReportBuilderLayouter = null;
@@ -121,8 +120,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
*/
private IReportBuilderLayouter getReportBuilderLayouter()
{
- final IReportBuilderLayouter aReportBuilderLayouter = (IReportBuilderLayouter) getLayoutMap().get(m_sReportBuilderLayoutName);
- return aReportBuilderLayouter;
+ return (IReportBuilderLayouter) getLayoutMap().get(m_sReportBuilderLayoutName);
}
private Object m_aReportDocument;
private XPropertySet m_documentDefinition;
@@ -168,8 +166,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
private XModeSelector getModeSelector()
{
final XController xController = getReportDefinition().getCurrentController();
- final XModeSelector xModeSelector = UnoRuntime.queryInterface(XModeSelector.class, xController);
- return xModeSelector;
+ return UnoRuntime.queryInterface(XModeSelector.class, xController);
}
private void switchOffAddFieldWindow()
@@ -586,8 +583,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
Object[] aParams = new Object[2];
aParams[0] = this;
aParams[1] = m_resource;
- final IReportBuilderLayouter aReportBuilderLayouter = (IReportBuilderLayouter) cTor.newInstance(aParams);
- return aReportBuilderLayouter;
+ return (IReportBuilderLayouter) cTor.newInstance(aParams);
}
catch (Exception e)
{
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
index 9094807570ad..02ad2438bb59 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
@@ -53,8 +53,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter
public String getLocalizedName()
{
- final String sLocalizedName = getResource().getResText(UIConsts.RID_REPORT + 81);
- return sLocalizedName;
+ return getResource().getResText(UIConsts.RID_REPORT + 81);
}
protected void insertDetailFields()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
index 2dc468fb09e7..51c14c42a536 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
@@ -51,8 +51,7 @@ public class ColumnarThreeColumns extends ColumnarTwoColumns
public String getLocalizedName()
{
- final String sLocalizedName = getResource().getResText(UIConsts.RID_REPORT + 83);
- return sLocalizedName;
+ return getResource().getResText(UIConsts.RID_REPORT + 83);
}
protected void insertDetailFields()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
index 023d447a939f..9dd9bb78201c 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
@@ -53,8 +53,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter
public String getLocalizedName()
{
- final String sLocalizedName = getResource().getResText(UIConsts.RID_REPORT + 82);
- return sLocalizedName;
+ return getResource().getResText(UIConsts.RID_REPORT + 82);
}
protected void insertDetailFields()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
index f2bdbcd6e428..12999090e646 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
@@ -181,7 +181,7 @@ public class DesignTemplate
// is aObj a textfield
// m_aDetailLabel_FD
// m_aDetailTextField_FD
- XFixedText aFixedText = (XFixedText) UnoRuntime.queryInterface(XFixedText.class, aObj);
+ XFixedText aFixedText = UnoRuntime.queryInterface(XFixedText.class, aObj);
if (aFixedText != null &&
m_aDetailLabel == null)
{
@@ -189,7 +189,7 @@ public class DesignTemplate
}
else
{
- XFormattedField aFormattedField = (XFormattedField) UnoRuntime.queryInterface(XFormattedField.class, aObj);
+ XFormattedField aFormattedField = UnoRuntime.queryInterface(XFormattedField.class, aObj);
if (aFormattedField != null &&
m_aDetailTextField == null)
{
@@ -218,7 +218,7 @@ public class DesignTemplate
try
{
Object aGroup = xGroups.getByIndex(nGroup);
- XGroup xGroup = (XGroup) UnoRuntime.queryInterface(XGroup.class, aGroup);
+ XGroup xGroup = UnoRuntime.queryInterface(XGroup.class, aGroup);
XSection xGroupSection = xGroup.getHeader();
final int nCount = xGroupSection.getCount();
@@ -227,7 +227,7 @@ public class DesignTemplate
try
{
Object aObj = xGroupSection.getByIndex(i);
- XFixedText aFixedText = (XFixedText) UnoRuntime.queryInterface(XFixedText.class, aObj);
+ XFixedText aFixedText = UnoRuntime.queryInterface(XFixedText.class, aObj);
// is aObj a label
// is aObj a textfield
if (aFixedText != null &&
@@ -237,7 +237,7 @@ public class DesignTemplate
}
else
{
- XFormattedField aFormattedField = (XFormattedField) UnoRuntime.queryInterface(XFormattedField.class, aObj);
+ XFormattedField aFormattedField = UnoRuntime.queryInterface(XFormattedField.class, aObj);
if (aFormattedField != null &&
m_aGroupTextField[nGroup] == null)
{
@@ -317,7 +317,7 @@ public class DesignTemplate
m_xGlobalMSF = _xMSF;
m_sFilename = _sPath;
final Object aObj = _xMSF.createInstance("com.sun.star.report.ReportDefinition");
- m_xReportDefinition = (XReportDefinition) UnoRuntime.queryInterface(XReportDefinition.class, aObj);
+ m_xReportDefinition = UnoRuntime.queryInterface(XReportDefinition.class, aObj);
PropertyValue[] aLoadProps = new PropertyValue[2];
aLoadProps[0] = Properties.createProperty(PropertyNames.URL, _sPath);
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
index f1c02112414a..3fa72ca047b2 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
@@ -54,8 +54,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns
public String getLocalizedName()
{
- final String sLocalizedName = getResource().getResText(UIConsts.RID_REPORT + 85);
- return sLocalizedName;
+ return getResource().getResText(UIConsts.RID_REPORT + 85);
}
protected void insertDetailFields()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
index b8ac18db61a4..34c2f9c10280 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
@@ -54,8 +54,7 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns
public String getLocalizedName()
{
- final String sLocalizedName = getResource().getResText(UIConsts.RID_REPORT + 84);
- return sLocalizedName;
+ return getResource().getResText(UIConsts.RID_REPORT + 84);
}
protected void insertDetailFields()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index e236405448f2..8d27f9e6507b 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -1,5 +1,4 @@
-/*
- ************************************************************************
+/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -210,7 +209,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
try
{
final Object aObj = _xSectionToClear.getByIndex(0);
- final XShape aShape = (XShape) UnoRuntime.queryInterface(XShape.class, aObj);
+ final XShape aShape = UnoRuntime.queryInterface(XShape.class, aObj);
_xSectionToClear.remove(aShape);
}
catch (com.sun.star.uno.Exception ex)
@@ -295,7 +294,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
// get all Page Styles
final Object aPageStylesObj = xNameAccess.getByName(_sStyleName);
- final XNameAccess xContainer = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, aPageStylesObj);
+ final XNameAccess xContainer = UnoRuntime.queryInterface(XNameAccess.class, aPageStylesObj);
// step over all Page Styles, search the one which is in use
final String[] aElementNames = xContainer.getElementNames();
@@ -303,7 +302,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
{
final String sName = aElementNames[i];
final Object aObj = xContainer.getByName(sName);
- final XStyle xStyle = (XStyle) UnoRuntime.queryInterface(XStyle.class, aObj);
+ final XStyle xStyle = UnoRuntime.queryInterface(XStyle.class, aObj);
if (xStyle.isInUse())
{
aUsedStyle = xStyle;
@@ -386,7 +385,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
{
final XGroups xGroups = getReportDefinition().getGroups();
Object aGroup = xGroups.getByIndex(_nGroup);
- XGroup xGroup = (XGroup) UnoRuntime.queryInterface(XGroup.class, aGroup);
+ XGroup xGroup = UnoRuntime.queryInterface(XGroup.class, aGroup);
XSection xGroupSection = xGroup.getHeader();
// copy Properties
@@ -560,7 +559,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
for (int i = 0; i < _aList.length; i++)
{
final String sField = _aList[i];
- if (listContains(m_aGroupNames, sField) == true)
+ if (listContains(m_aGroupNames, sField))
{
continue;
}
@@ -662,7 +661,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
try
{
final Object aFixedText = getMSFofReportDefinition().createInstance("com.sun.star.report.FixedText");
- final XFixedText xFixedText = (XFixedText) UnoRuntime.queryInterface(XFixedText.class, aFixedText);
+ final XFixedText xFixedText = UnoRuntime.queryInterface(XFixedText.class, aFixedText);
int nHeight = LayoutConstants.LabelHeight; // default height of label is fixed.
@@ -722,8 +721,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
if (_sName.startsWith("field:["))
{
int nCloseBrace = _sName.lastIndexOf("]");
- final String sName = _sName.substring(7, nCloseBrace).trim();
- return sName;
+ return _sName.substring(7, nCloseBrace).trim();
}
return _sName;
}
@@ -775,7 +773,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
}
_aRect.Height = nHeight;
- final XReportControlModel xReportControlModel = (XReportControlModel) UnoRuntime.queryInterface(XReportControlModel.class, aField);
+ final XReportControlModel xReportControlModel = UnoRuntime.queryInterface(XReportControlModel.class, aField);
if (xReportControlModel != null)
{
// #i86907# not documented right in idl description.
@@ -802,7 +800,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
|| nType == DataType.LONGVARBINARY)
{
// aField = getMSFofReportDefinition().createInstance("com.sun.star.report.ImageControl");
- final XImageControl xImageControl = (XImageControl) UnoRuntime.queryInterface(XImageControl.class, xReportControlModel);
+ final XImageControl xImageControl = UnoRuntime.queryInterface(XImageControl.class, xReportControlModel);
if (xImageControl != null)
{
// xImageControl.setScaleImage(true);
@@ -828,11 +826,11 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
// spezial case rpt:now() (default date format)
if (_sFormattedfield.equals("rpt:now()"))
{
- final XFormattedField xFormattedField = (XFormattedField) UnoRuntime.queryInterface(XFormattedField.class, xReportControlModel);
+ final XFormattedField xFormattedField = UnoRuntime.queryInterface(XFormattedField.class, xReportControlModel);
XNumberFormatsSupplier x = xFormattedField.getFormatsSupplier();
XNumberFormats xFormats = x.getNumberFormats();
- XNumberFormatTypes x3 = (XNumberFormatTypes) UnoRuntime.queryInterface(XNumberFormatTypes.class, xFormats);
+ XNumberFormatTypes x3 = UnoRuntime.queryInterface(XNumberFormatTypes.class, xFormats);
Locale.getDefault();
com.sun.star.lang.Locale aLocale = new com.sun.star.lang.Locale();
aLocale.Country = Locale.getDefault().getCountry();
@@ -869,8 +867,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
{
if (m_xMSF == null)
{
- final XMultiServiceFactory xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, getReportDefinition());
- m_xMSF = xMSF;
+ m_xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, getReportDefinition());
}
return m_xMSF;
}
@@ -893,7 +890,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
try
{
final Object aFixedLine = getMSFofReportDefinition().createInstance("com.sun.star.report.FixedLine");
- final XFixedLine xFixedLine = (XFixedLine) UnoRuntime.queryInterface(XFixedLine.class, aFixedLine);
+ final XFixedLine xFixedLine = UnoRuntime.queryInterface(XFixedLine.class, aFixedLine);
xFixedLine.setOrientation(_nOrientation);
// TODO: line width is fixed
@@ -1135,7 +1132,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
// XControlContainer xControlContainer = (XControlContainer)UnoRuntime.queryInterface(XControlContainer.class, aControlContainer);
final Object aFixedTextModel = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlFixedTextModel");
- final XControlModel xFixedTextModel = (XControlModel) UnoRuntime.queryInterface(XControlModel.class, aFixedTextModel);
+ final XControlModel xFixedTextModel = UnoRuntime.queryInterface(XControlModel.class, aFixedTextModel);
final PropertySetHelper aPropertySetHelper = new PropertySetHelper(xFixedTextModel);
// aPropertySetHelper.showProperties();
@@ -1145,34 +1142,34 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
// XServiceInfo xServiceInfo2 = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, aUnoCtrlFixedText);
// String[] sServices2 = xServiceInfo2.getSupportedServiceNames();
- final XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, aUnoCtrlFixedText);
+ final XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, aUnoCtrlFixedText);
xWindow.setVisible(false);
- final XControl xControl = (XControl) UnoRuntime.queryInterface(XControl.class, aUnoCtrlFixedText);
+ final XControl xControl = UnoRuntime.queryInterface(XControl.class, aUnoCtrlFixedText);
xControl.setModel(xFixedTextModel);
- final com.sun.star.awt.XFixedText xFixedText = (com.sun.star.awt.XFixedText) UnoRuntime.queryInterface(com.sun.star.awt.XFixedText.class, aUnoCtrlFixedText);
+ final com.sun.star.awt.XFixedText xFixedText = UnoRuntime.queryInterface(com.sun.star.awt.XFixedText.class, aUnoCtrlFixedText);
xFixedText.setText(_sText);
- final XLayoutConstrains xLayoutConstraints = (XLayoutConstrains) UnoRuntime.queryInterface(XLayoutConstrains.class, aUnoCtrlFixedText);
+ final XLayoutConstrains xLayoutConstraints = UnoRuntime.queryInterface(XLayoutConstrains.class, aUnoCtrlFixedText);
final Size aSizeInPixel = xLayoutConstraints.getPreferredSize();
- final XWindowPeer xPeerOfReportDefinition = (XWindowPeer) UnoRuntime.queryInterface(XWindowPeer.class, getReportDefinition().getCurrentController().getFrame().getComponentWindow());
+ final XWindowPeer xPeerOfReportDefinition = UnoRuntime.queryInterface(XWindowPeer.class, getReportDefinition().getCurrentController().getFrame().getComponentWindow());
xControl.createPeer(null, xPeerOfReportDefinition);
final XWindowPeer x = xControl.getPeer();
- final XUnitConversion xConversion = (XUnitConversion) UnoRuntime.queryInterface(XUnitConversion.class, x);
+ final XUnitConversion xConversion = UnoRuntime.queryInterface(XUnitConversion.class, x);
aSizeMM_100TH = xConversion.convertSizeToLogic(aSizeInPixel, com.sun.star.util.MeasureUnit.MM_100TH);
// xToolkit.createScreenCompatibleDevice(_nWidth, _nWidth).
// XWindow x = getReportDefinition().getCurrentController().getFrame().getContainerWindow();
// Object aObj = _xSection.getParent();
// we don't need the created objects any longer
- final XComponent xFixedTextDeleter = (XComponent) UnoRuntime.queryInterface(XComponent.class, xFixedText);
+ final XComponent xFixedTextDeleter = UnoRuntime.queryInterface(XComponent.class, xFixedText);
xFixedTextDeleter.dispose();
- final XComponent xFixedTextModelDeleter = (XComponent) UnoRuntime.queryInterface(XComponent.class, aFixedTextModel);
+ final XComponent xFixedTextModelDeleter = UnoRuntime.queryInterface(XComponent.class, aFixedTextModel);
xFixedTextModelDeleter.dispose();
}
catch (Exception e)
@@ -1215,8 +1212,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
*/
private void copyProperties(Object _aFrom, Object _aTo)
{
- XPropertySet xFrom = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, _aFrom);
- XPropertySet xTo = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, _aTo);
+ XPropertySet xFrom = UnoRuntime.queryInterface(XPropertySet.class, _aFrom);
+ XPropertySet xTo = UnoRuntime.queryInterface(XPropertySet.class, _aTo);
XPropertySetInfo xForeignPropInfo = xFrom.getPropertySetInfo();
@@ -1258,7 +1255,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
while (xEnum.hasMoreElements())
{
Object aEnumObj = xEnum.nextElement();
- XReportComponent aComponent = (XReportComponent) UnoRuntime.queryInterface(XReportComponent.class, aEnumObj);
+ XReportComponent aComponent = UnoRuntime.queryInterface(XReportComponent.class, aEnumObj);
// XCloneable aClone = (XCloneable)UnoRuntime.queryInterface(XCloneable.class, aEnumObj);
if (aComponent != null)
@@ -1266,7 +1263,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
Object aClone = aComponent.createClone();
if (aClone != null)
{
- XShape aShape = (XShape) UnoRuntime.queryInterface(XShape.class, aClone);
+ XShape aShape = UnoRuntime.queryInterface(XShape.class, aClone);
// normally 'createClone' will create a real clone of the component,
// but there seems some problems, we have to controll.
@@ -1311,8 +1308,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
{
Logger.getLogger(ReportBuilderLayouter.class.getName()).log(Level.SEVERE, null, e);
}
- return;
- }
+ }
else
{
// we won't a page header
@@ -1469,10 +1465,9 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
aRect.Y += nLineHeight;
aRect.Y += LayoutConstants.LabelHeight;
- final int nWidth = nUsablePageWidth;
aRect.X = getLeftPageIndent();
- aRect = insertFormattedField(xSection, "rpt:" + sNoFirstUnusedQuotes, aRect, nWidth, null, (short) com.sun.star.awt.TextAlign.CENTER);
+ aRect = insertFormattedField(xSection, "rpt:" + sNoFirstUnusedQuotes, aRect, nUsablePageWidth, null, (short) com.sun.star.awt.TextAlign.CENTER);
aRect.Y += LayoutConstants.FormattedFieldHeight + LayoutConstants.LineHeight;
xSection.setHeight(aRect.Y);
@@ -1598,7 +1593,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
if (m_aFixedTextHelper == null)
{
final Object aFixedText = getMSFofReportDefinition().createInstance("com.sun.star.report.FixedText");
- m_aFixedTextHelper = (XFixedText) UnoRuntime.queryInterface(XFixedText.class, aFixedText);
+ m_aFixedTextHelper = UnoRuntime.queryInterface(XFixedText.class, aFixedText);
}
m_aFixedTextHelper.setLabel(_sLabel);
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
index 8df754795e63..6830d56b5107 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
@@ -44,8 +44,7 @@ public class SectionEmptyObject extends SectionObject
public static SectionObject create()
{
- SectionEmptyObject a = new SectionEmptyObject();
- return a;
+ return new SectionEmptyObject();
}
public FontDescriptor getFontDescriptor()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
index ae3766fd3391..9780a1350681 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
@@ -48,8 +48,7 @@ public class SectionLabel extends SectionObject
public static SectionObject create(XFixedText _aFixedText)
{
- final SectionLabel a = new SectionLabel(_aFixedText);
- return a;
+ return new SectionLabel(_aFixedText);
}
/**
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
index 2a11fcd56f04..fc17ba0ab5aa 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
@@ -46,8 +46,7 @@ public class SectionTextField extends SectionObject
public static SectionObject create(XFormattedField _aFormattedField)
{
- SectionTextField a = new SectionTextField(_aFormattedField);
- return a;
+ return new SectionTextField(_aFormattedField);
}
public FontDescriptor getFontDescriptor()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
index 51edc3e3ac13..c2d85fb58e61 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
@@ -55,8 +55,7 @@ public class Tabular extends ReportBuilderLayouter
public String getLocalizedName()
{
- String sLocalizedName = getResource().getResText(UIConsts.RID_REPORT + 80);
- return sLocalizedName;
+ return getResource().getResText(UIConsts.RID_REPORT + 80);
}
protected void insertDetailFields()