Kaydet (Commit) 44de119c authored tarafından Caolán McNamara's avatar Caolán McNamara

WaE: gcc 4.6.0 various warnings

üst 9d47c89f
...@@ -889,7 +889,6 @@ DBG_NAME(DbaIndexDialog) ...@@ -889,7 +889,6 @@ DBG_NAME(DbaIndexDialog)
void DbaIndexDialog::resizeControls(const Size& _rDiff) void DbaIndexDialog::resizeControls(const Size& _rDiff)
{ {
// we use large images so we must change them // we use large images so we must change them
Size aTbNewSize = m_aActions.GetSizePixel();
if ( _rDiff.Width() || _rDiff.Height() ) if ( _rDiff.Width() || _rDiff.Height() )
{ {
Size aDlgSize = GetSizePixel(); Size aDlgSize = GetSizePixel();
......
...@@ -387,13 +387,9 @@ DBG_NAME(OTableSubscriptionPage) ...@@ -387,13 +387,9 @@ DBG_NAME(OTableSubscriptionPage)
// get the current table filter // get the current table filter
SFX_ITEMSET_GET(_rSet, pTableFilter, OStringListItem, DSID_TABLEFILTER, sal_True); SFX_ITEMSET_GET(_rSet, pTableFilter, OStringListItem, DSID_TABLEFILTER, sal_True);
SFX_ITEMSET_GET(_rSet, pSuppress, SfxBoolItem, DSID_SUPPRESSVERSIONCL, sal_True);
Sequence< ::rtl::OUString > aTableFilter; Sequence< ::rtl::OUString > aTableFilter;
sal_Bool bSuppressVersionColumns = sal_True;
if (pTableFilter) if (pTableFilter)
aTableFilter = pTableFilter->getList(); aTableFilter = pTableFilter->getList();
if (pSuppress)
bSuppressVersionColumns = pSuppress->GetValue();
implCompleteTablesCheck( aTableFilter ); implCompleteTablesCheck( aTableFilter );
......
...@@ -55,7 +55,7 @@ namespace dbaui ...@@ -55,7 +55,7 @@ namespace dbaui
virtual TypeSelectionPageFactory virtual TypeSelectionPageFactory
getTypeSelectionPageFactory(); getTypeSelectionPageFactory();
void TableDataOn(SvxCellHorJustify& eVal,int nToken); void TableDataOn(SvxCellHorJustify& eVal);
void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor);
sal_Int16 GetWidthPixel( const HTMLOption* pOption ); sal_Int16 GetWidthPixel( const HTMLOption* pOption );
void setTextEncoding(); void setTextEncoding();
......
...@@ -347,11 +347,10 @@ void OHTMLReader::fetchOptions() ...@@ -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@sun.com", "OHTMLReader::TableDataOn" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::TableDataOn" );
DBG_CHKTHIS(OHTMLReader,NULL); DBG_CHKTHIS(OHTMLReader,NULL);
sal_Bool bHorJustifyCenterTH = (nToken == HTML_TABLEHEADER_ON);
const HTMLOptions* pHtmlOptions = GetOptions(); const HTMLOptions* pHtmlOptions = GetOptions();
sal_Int16 nArrLen = pHtmlOptions->Count(); sal_Int16 nArrLen = pHtmlOptions->Count();
for ( sal_Int16 i = 0; i < nArrLen; i++ ) for ( sal_Int16 i = 0; i < nArrLen; i++ )
...@@ -361,7 +360,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,int nToken) ...@@ -361,7 +360,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,int nToken)
{ {
case HTML_O_ALIGN: case HTML_O_ALIGN:
{ {
bHorJustifyCenterTH = sal_False;
const String& rOptVal = pOption->GetString(); const String& rOptVal = pOption->GetString();
if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right )) if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ))
eVal = SVX_HOR_JUSTIFY_RIGHT; eVal = SVX_HOR_JUSTIFY_RIGHT;
...@@ -489,7 +487,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken) ...@@ -489,7 +487,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
break; break;
case HTML_TABLEDATA_ON: case HTML_TABLEDATA_ON:
case HTML_TABLEHEADER_ON: case HTML_TABLEHEADER_ON:
TableDataOn(eVal,nTmpToken2); TableDataOn(eVal);
bTableHeader = TRUE; bTableHeader = TRUE;
break; break;
case HTML_TABLEDATA_OFF: case HTML_TABLEDATA_OFF:
......
...@@ -130,7 +130,6 @@ void ORTFReader::NextToken( int nToken ) ...@@ -130,7 +130,6 @@ void ORTFReader::NextToken( int nToken )
{ {
int nTmpToken2 = GetNextToken(); int nTmpToken2 = GetNextToken();
sal_Bool bNext = TRUE;
do do
{ {
Color aColor; Color aColor;
...@@ -141,8 +140,7 @@ void ORTFReader::NextToken( int nToken ) ...@@ -141,8 +140,7 @@ void ORTFReader::NextToken( int nToken )
case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break;
case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break;
case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break;
default: default: break;
bNext = sal_False;
} }
nTmpToken2 = GetNextToken(); nTmpToken2 = GetNextToken();
} }
......
...@@ -148,11 +148,6 @@ namespace dbaui ...@@ -148,11 +148,6 @@ namespace dbaui
xParamCallback = Reference< XInteractionSupplyParameters >(_rContinuations[nParamPos], UNO_QUERY); 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"); 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); OParameterDialog aDlg(NULL, _rParamRequest.Parameters, _rParamRequest.Connection, m_xORB);
sal_Int16 nResult = aDlg.Execute(); sal_Int16 nResult = aDlg.Execute();
try try
...@@ -284,11 +279,6 @@ namespace dbaui ...@@ -284,11 +279,6 @@ namespace dbaui
Reference< XInteractionDocumentSave > xCallback(_rContinuations[nDocuPos], UNO_QUERY); Reference< XInteractionDocumentSave > xCallback(_rContinuations[nDocuPos], UNO_QUERY);
DBG_ASSERT(xCallback.is(), "BasicInteractionHandler::implHandle(DocumentSaveRequest): can't save document without an appropriate interaction handler!s"); 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); OCollectionView aDlg(NULL,_rDocuRequest.Content,_rDocuRequest.Name,m_xORB);
sal_Int16 nResult = aDlg.Execute(); sal_Int16 nResult = aDlg.Execute();
try try
......
...@@ -342,8 +342,6 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) ...@@ -342,8 +342,6 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
} }
sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel(); sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel();
const Point aPos = _pSplitter->GetPosPixel();
const uno::Reference< report::XSection> xSection = m_aReportSection.getSection(); const uno::Reference< report::XSection> xSection = m_aReportSection.getSection();
nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height(); nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment