[Libreoffice-commits] .: dbaccess/source reportdesign/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 27 12:02:18 PST 2011
dbaccess/source/ui/dlg/indexdialog.cxx | 1 -
dbaccess/source/ui/dlg/tablespage.cxx | 4 ----
dbaccess/source/ui/inc/HtmlReader.hxx | 2 +-
dbaccess/source/ui/misc/HtmlReader.cxx | 6 ++----
dbaccess/source/ui/misc/RtfReader.cxx | 4 +---
dbaccess/source/ui/uno/dbinteraction.cxx | 10 ----------
reportdesign/source/ui/report/SectionWindow.cxx | 2 --
7 files changed, 4 insertions(+), 25 deletions(-)
New commits:
commit cd5b04851c596c69cd4af78fa0149cbb57237eef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 11:24:16 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 695549a..79a0b68 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -889,7 +889,6 @@ DBG_NAME(DbaIndexDialog)
void DbaIndexDialog::resizeControls(const Size& _rDiff)
{
// we use large images so we must change them
- Size aTbNewSize = m_aActions.GetSizePixel();
if ( _rDiff.Width() || _rDiff.Height() )
{
Size aDlgSize = GetSizePixel();
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 99857a2..0f87e99 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -387,13 +387,9 @@ DBG_NAME(OTableSubscriptionPage)
// get the current table filter
SFX_ITEMSET_GET(_rSet, pTableFilter, OStringListItem, DSID_TABLEFILTER, sal_True);
- SFX_ITEMSET_GET(_rSet, pSuppress, SfxBoolItem, DSID_SUPPRESSVERSIONCL, sal_True);
Sequence< ::rtl::OUString > aTableFilter;
- sal_Bool bSuppressVersionColumns = sal_True;
if (pTableFilter)
aTableFilter = pTableFilter->getList();
- if (pSuppress)
- bSuppressVersionColumns = pSuppress->GetValue();
implCompleteTablesCheck( aTableFilter );
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index 73f9db1..410a879 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -55,7 +55,7 @@ namespace dbaui
virtual TypeSelectionPageFactory
getTypeSelectionPageFactory();
- void TableDataOn(SvxCellHorJustify& eVal,int nToken);
+ void TableDataOn(SvxCellHorJustify& eVal);
void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor);
sal_Int16 GetWidthPixel( const HTMLOption* pOption );
void setTextEncoding();
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index b03151e..41847da 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -347,11 +347,10 @@ void OHTMLReader::fetchOptions()
}
}
//---------------------------------------------------------------------------------
-void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,int nToken)
+void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLReader::TableDataOn" );
DBG_CHKTHIS(OHTMLReader,NULL);
- sal_Bool bHorJustifyCenterTH = (nToken == HTML_TABLEHEADER_ON);
const HTMLOptions* pHtmlOptions = GetOptions();
sal_Int16 nArrLen = pHtmlOptions->Count();
for ( sal_Int16 i = 0; i < nArrLen; i++ )
@@ -361,7 +360,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,int nToken)
{
case HTML_O_ALIGN:
{
- bHorJustifyCenterTH = sal_False;
const String& rOptVal = pOption->GetString();
if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ))
eVal = SVX_HOR_JUSTIFY_RIGHT;
@@ -489,7 +487,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
break;
case HTML_TABLEDATA_ON:
case HTML_TABLEHEADER_ON:
- TableDataOn(eVal,nTmpToken2);
+ TableDataOn(eVal);
bTableHeader = TRUE;
break;
case HTML_TABLEDATA_OFF:
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index b9e57c3..f810b18 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -130,7 +130,6 @@ void ORTFReader::NextToken( int nToken )
{
int nTmpToken2 = GetNextToken();
- sal_Bool bNext = TRUE;
do
{
Color aColor;
@@ -141,8 +140,7 @@ void ORTFReader::NextToken( int nToken )
case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break;
case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break;
case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break;
- default:
- bNext = sal_False;
+ default: break;
}
nTmpToken2 = GetNextToken();
}
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index f0fbb2d..d4abfe2 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -148,11 +148,6 @@ namespace dbaui
xParamCallback = Reference< XInteractionSupplyParameters >(_rContinuations[nParamPos], UNO_QUERY);
DBG_ASSERT(xParamCallback.is(), "BasicInteractionHandler::implHandle(ParametersRequest): can't set the parameters without an appropriate interaction handler!s");
- // determine the style of the dialog, dependent on the present continuation types
- WinBits nDialogStyle = WB_OK | WB_DEF_OK;
- if (-1 != nAbortPos)
- nDialogStyle = WB_OK_CANCEL;
-
OParameterDialog aDlg(NULL, _rParamRequest.Parameters, _rParamRequest.Connection, m_xORB);
sal_Int16 nResult = aDlg.Execute();
try
@@ -284,11 +279,6 @@ namespace dbaui
Reference< XInteractionDocumentSave > xCallback(_rContinuations[nDocuPos], UNO_QUERY);
DBG_ASSERT(xCallback.is(), "BasicInteractionHandler::implHandle(DocumentSaveRequest): can't save document without an appropriate interaction handler!s");
- // determine the style of the dialog, dependent on the present continuation types
- WinBits nDialogStyle = WB_OK | WB_DEF_OK;
- if (-1 != nAbortPos)
- nDialogStyle = WB_OK_CANCEL;
-
OCollectionView aDlg(NULL,_rDocuRequest.Content,_rDocuRequest.Name,m_xORB);
sal_Int16 nResult = aDlg.Execute();
try
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 2517b02..f7ef23f 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -342,8 +342,6 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
}
sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel();
- const Point aPos = _pSplitter->GetPosPixel();
-
const uno::Reference< report::XSection> xSection = m_aReportSection.getSection();
nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height();
More information about the Libreoffice-commits
mailing list