[Libreoffice-commits] .: mysqlc/source sdext/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 18 07:51:28 PDT 2010
mysqlc/source/mysqlc_resultset.cxx | 12 ----
sdext/source/minimizer/unodialog.cxx | 49 ------------------
sdext/source/minimizer/unodialog.hxx | 4 -
sdext/source/pdfimport/filterdet.cxx | 26 ---------
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 16 -----
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 20 -------
6 files changed, 1 insertion(+), 126 deletions(-)
New commits:
commit 51b3b7ca8c71e86e5fc6da76a95b8c6bc1aecdc9
Author: Povilas Kanapickas <povilas.kanapickas at gmail.com>
Date: Mon Oct 18 15:50:38 2010 +0100
remove non-compiled code
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index a7d01d9..2898d12 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -241,18 +241,6 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column)
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
}
return sal_False;
-#if 0
- OUString str = getString(column);
- switch (str[0]) {
- case '1':
- case 't':
- case 'T':
- case 'y':
- case 'Y':
- return sal_True;
- }
- return sal_False;
-#endif
}
/* }}} */
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index a11ce50..554a353 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -344,55 +344,6 @@ void UnoDialog::setControlProperty( const OUString& rControlName, const OUString
}
// -----------------------------------------------------------------------------
-#if 0
-void UnoDialog::showMessageBox( const OUString& rTitle, const OUString& rMessage, sal_Bool bErrorBox ) const
-{
- try
- {
- Reference< XMessageBoxFactory > xMessageBoxFactory( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ), mxMSF ), UNO_QUERY_THROW );
- if ( xMessageBoxFactory.is() )
- {
- Rectangle aRectangle( 0, 0, 0, 0 );
- Reference< XMessageBox > xMessageBox( xMessageBoxFactory->createMessageBox( mxWindowPeer, aRectangle,
- bErrorBox ? OUString( RTL_CONSTASCII_USTRINGPARAM( "errorbox" ) ) : OUString( RTL_CONSTASCII_USTRINGPARAM( "querybox" ) ), MessageBoxButtons::BUTTONS_OK, rTitle, rMessage ) );
- Reference< XComponent > xComponent( xMessageBox, UNO_QUERY_THROW );
- /* sal_Int16 nResult = */ xMessageBox->execute();
- xComponent->dispose();
- }
- }
- catch ( Exception& )
- {
- }
-
-/*
-public void showErrorMessageBox(XWindowPeer _xParentWindowPeer, String _sTitle, String _sMessage){
-XComponent xComponent = null;
-try {
- Object oToolkit = m_xMCF.createInstanceWithContext("com.sun.star.awt.Toolkit", m_xContext);
- XMessageBoxFactory xMessageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit);
- // rectangle may be empty if position is in the center of the parent peer
-
- Rectangle aRectangle = new Rectangle();
- XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xParentWindowPeer, aRectangle, "errorbox", com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
- xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox);
- if (xMessageBox != null){
- short nResult = xMessageBox.execute();
- }
-} catch (com.sun.star.uno.Exception ex) {
- ex.printStackTrace(System.out);
-}
-finally{
- //make sure always to dispose the component and free the memory!
- if (xComponent != null){
- xComponent.dispose();
- }
-}}
-*/
-}
-
-#endif
-
-// -----------------------------------------------------------------------------
sal_Int32 UnoDialog::getMapsFromPixels( sal_Int32 nPixels ) const
{
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 61ec524..a923e31 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -114,9 +114,7 @@ public :
void setControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue );
com::sun::star::uno::Any getControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName );
-#if 0
- void showMessageBox( const rtl::OUString& rTitle, const rtl::OUString& rMessage, sal_Bool bErrorBox ) const;
-#endif
+
void enableControl( const rtl::OUString& rControlName );
void disableControl( const rtl::OUString& rControlName );
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 7a6f75a..265ccbc 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -180,32 +180,6 @@ namespace {
return aMethods;
}
};
-#if 0 // code currently unused (see below)
- sal_Int32 queryDocumentTypeDialog( const uno::Reference<uno::XComponentContext>& xContext,
- const rtl::OUString& rFilename )
- {
- uno::Reference<awt::XDialogProvider2> xDialogProvider(
- xContext->getServiceManager()->createInstanceWithContext(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.DialogProvider2" ) ),
- xContext ),
- uno::UNO_QUERY_THROW );
- rtl::Reference<ChooserDialogHandler> xHandler(new ChooserDialogHandler);
- uno::Reference<awt::XDialog> xDialog = xDialogProvider->createDialogWithHandler(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:PDFImport.TargetChooser?location=application") ),
- uno::Reference<awt::XDialogEventHandler>(
- static_cast<cppu::OWeakObject*>(xHandler.get()), uno::UNO_QUERY_THROW));
- xHandler->initControls(
- uno::Reference<awt::XControlContainer>(
- xDialog,
- uno::UNO_QUERY_THROW ),
- rFilename );
-
- if( !xDialog->execute() )
- return -1;
- else
- return xHandler->getSelectedItem();
- }
-#endif
}
class FileEmitContext : public pdfparse::EmitContext
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index cc15677..bb6c6c6 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -129,22 +129,6 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
isComplex = true;
}
- #if 0
- // FIXME: need to have a service to do this mirroring
- if (isComplex) // If so, reverse string
- {
- rtl::OUString flippedStr(RTL_CONSTASCII_USTRINGPARAM( "" ));
- for(int i = str.getLength() - 1; i >= 0; i--)
- {
- sal_Unicode cChar = str[ i ];
- cChar = static_cast<sal_Unicode>(GetMirroredChar( cChar ));
- rtl::OUString uC(cChar);
- flippedStr += uC;
- }
- str = flippedStr;
- }
- #endif
-
m_rEmitContext.rEmitter.beginTag( "text:span", aProps );
for(int i=0; i< elem.Text.getLength(); i++)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 57a0e8b..4280ce1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -905,16 +905,6 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
printf( "drawImage %d %d 0", width, height );
writePng_( aBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert, true );
writeBinaryBuffer( aBuf );
- #if 0
- OutputBuffer aBuf; initBuf(aBuf);
- OutputBuffer aMaskBuf; initBuf(aMaskBuf);
-
- printf( "drawMaskedImage %d %d %d %d %d", width, height, maskWidth, maskHeight, 0 /*maskInvert note: currently we do inversion here*/ );
- writeImage( aBuf, str, width, height, colorMap );
- writeMaskLF( aMaskBuf, maskStr, width, height, maskInvert );
- writeBinaryBuffer(aBuf);
- writeBinaryBuffer(aMaskBuf);
- #endif
}
void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
@@ -928,16 +918,6 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
printf( "drawImage %d %d 0", width, height );
writePng_( aBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap, true );
writeBinaryBuffer( aBuf );
- #if 0
- OutputBuffer aBuf; initBuf(aBuf);
- OutputBuffer aMaskBuf; initBuf(aMaskBuf);
-
- printf( "drawSoftMaskedImage %d %d %d %d", width, height, maskWidth, maskHeight );
- writeImage( aBuf, str, width, height, colorMap );
- writeImageLF( aMaskBuf, maskStr, maskWidth, maskHeight, maskColorMap );
- writeBinaryBuffer(aBuf);
- writeBinaryBuffer(aMaskBuf);
- #endif
}
void PDFOutDev::setPageNum( int nNumPages )
More information about the Libreoffice-commits
mailing list