[Libreoffice-commits] core.git: 3 commits - lotuswordpro/source sc/inc sc/source sdext/source sw/source unusedcode.easy
Caolán McNamara
caolanm at redhat.com
Fri Apr 18 01:48:28 PDT 2014
lotuswordpro/source/filter/lwpfilter.cxx | 151 ----------------------------
lotuswordpro/source/filter/lwpfilter.hxx | 45 --------
sc/inc/scmod.hxx | 1
sc/source/ui/app/scmod.cxx | 12 --
sdext/source/presenter/PresenterToolBar.cxx | 16 ++
sw/source/filter/ww8/sortedarray.hxx | 4
unusedcode.easy | 11 +-
7 files changed, 23 insertions(+), 217 deletions(-)
New commits:
commit 42dd5615429e6273e9169a4bd941ad56fec1e6f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 18 09:45:38 2014 +0100
Related: rhbz#1088625 PresenterPaintManager seen as NULL
Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index dd0ca91..4c825ed 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea (
const awt::Rectangle& rRepaintBox,
const bool bSynchronous)
{
- mpPresenterController->GetPaintManager()->Invalidate(
+ ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+ if (!xManager)
+ return;
+ xManager->Invalidate(
mxWindow,
rRepaintBox,
bSynchronous);
@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void)
{
mbIsLayoutPending = true;
- mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
+ ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+ if (!xManager)
+ return;
+
+ xManager->Invalidate(mxWindow);
}
geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
@@ -822,7 +829,10 @@ void PresenterToolBar::Layout (
}
// The whole window has to be repainted.
- mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
+ ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+ if (!xManager)
+ return;
+ xManager->Invalidate(mxWindow);
}
geometry::RealSize2D PresenterToolBar::CalculatePartSize (
commit 8773d9695845913bea8c969309d95e6cb585328e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 18 09:34:23 2014 +0100
callcatcher: update unused code
Change-Id: Ia88d83a209113fa4c351c0300d407da0c71baeac
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index c316cc7..edf53d5 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -130,157 +130,6 @@ void LWPFilterReader::cancel() throw (com::sun::star::uno::RuntimeException, std
{
}
-LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference< XMultiServiceFactory >& xFact )
-{
- try
- {
- uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString( STR_WRITER_IMPORTER_NAME ) ), UNO_QUERY );
-
- LWPFilterReader *p = new LWPFilterReader;
- p->setDocumentHandler( xDoc );
-
- uno::Reference< XImporter > xImporter = uno::Reference< XImporter >( xDoc, UNO_QUERY );
- rImporter = xImporter;
- uno::Reference< XFilter > xFilter = uno::Reference< XFilter >( p );
- rFilter = xFilter;
- }
- catch( Exception & )
- {
- exit( 1 );
- }
-}
-
-LWPFilterImportFilter::~LWPFilterImportFilter()
-{
-}
-
-sal_Bool LWPFilterImportFilter::filter( const Sequence< PropertyValue >& aDescriptor )
- throw( RuntimeException, std::exception )
-{
- sal_Bool ret = rFilter->filter( aDescriptor );
-
- return ret;
-}
-
-void LWPFilterImportFilter::cancel() throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
- rFilter->cancel();
-}
-
-void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent >& xDoc )
- throw( IllegalArgumentException, RuntimeException, std::exception )
-{
- rImporter->setTargetDocument( xDoc );
-}
-
-OUString LWPFilterImportFilter::getImplementationName() throw(std::exception)
-{
- return OUString( STR_IMPLEMENTATION_NAME );
-}
-
-sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) throw(std::exception)
-{
- return cppu::supportsService(this, ServiceName);
-}
-
-Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw(std::exception)
-{
- Sequence< OUString > seq(1);
- seq[0] = STR_SERVICE_NAME;
- return seq;
-}
-
-OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
- OUString ret;
- OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection)
- // opening as template is done when a parameter tells to do so and a template filter can be detected
- // (otherwise no valid filter would be found) or if the detected filter is a template filter and
- // there is no parameter that forbids to open as template
- sal_Bool bOpenAsTemplate = sal_False;
- sal_Int32 nPropertyCount = aDescriptor.getLength();
- for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
- {
- if ( aDescriptor[nProperty].Name == "TypeName" )
- {
- aDescriptor[nProperty].Value >>= aTypeName;
- }
- else if ( aDescriptor[nProperty].Name == "AsTemplate" )
- {
- bOpenAsTemplate = sal_True;
- }
- }
-
- for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
- {
- OUString strTemp;
- aDescriptor[i].Value >>= strTemp;
- if ( aDescriptor[i].Name == "InputStream" )
- {
- uno::Reference< XInputStream> rInputStream;
- aDescriptor[i].Value >>= rInputStream;
-
- // TODO TRANSFORM IMPLEMENTATION HERE!!!!!!
- // and call m_DocumentHandler's SAX mDochods
-
- if( IsWordproFile(rInputStream) )
- {
- if ( aTypeName == "wordpro_template" )
- {
- if(!bOpenAsTemplate)
- {
- aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = "AsTemplate";
- aDescriptor[nPropertyCount].Value <<= sal_True;
- }
- return OUString("wordpro_template");
- }
- else
- {
- return OUString("wordpro");
- }
- }
- return ret;
- }
- else if ( aDescriptor[i].Name == "URL" )
- {
- OUString sURL;
-
- aDescriptor[i].Value >>= sURL;
- /*
- osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL( sURL, sFileName );
- if(rc != osl::FileBase::E_None)
- {
- SAXException except;
- except.Message = "GDocting system path from URL failed!";
- throw except;
- }
- */
- //end with .lwp:
- if( IsWordproFile(sURL) )
- {
- if ( aTypeName == "wordpro_template" )
- {
- if(!bOpenAsTemplate)
- {
- aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = "AsTemplate";
- aDescriptor[nPropertyCount].Value <<= sal_True;
- }
- return OUString("wordpro_template");
- }
- else
- {
- return OUString("wordpro");
- }
- }
- return ret;
- }
- }
- return ret;
-}
-
/**
* @descr decompressed small file
* @param pCompressed - real file stream
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index 06b7357..b41fdc6 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -123,51 +123,6 @@ private:
uno::Reference< XDocumentHandler > m_DocumentHandler;
};
-/**
- * @brief
- * Main entry for the xml filter framework.
- * It's called by SfxObjectShell::ImportFrom.
- */
-class LWPFilterImportFilter : public WeakImplHelper4< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection >
-{
-public:
- LWPFilterImportFilter( const uno::Reference< XMultiServiceFactory >& xFact );
- virtual ~LWPFilterImportFilter();
-
-public:
- /**
- * @descr see LWPFilterReader::filter.
- */
- virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
- throw( RuntimeException, std::exception ) SAL_OVERRIDE;
-
- /**
- * @descr see LWPFilterReader::cancel.
- */
- virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- // XImporter
- virtual void SAL_CALL setTargetDocument( const uno::Reference< XComponent >& xDoc)
- throw( IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE;
-
- // XServiceInfo
- OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE;
-
- Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE;
-
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE;
-
- /**
- * @descr function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever
- * a file is to be loaded.
- */
- virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-public:
- uno::Reference< XFilter > rFilter;
- uno::Reference< XImporter > rImporter;
-};
-
//test code
int ReadWordproFile(SvStream &rStream, uno::Reference<XDocumentHandler>& XDoc);
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index dde69452..f15ea33 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -250,7 +250,6 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO
SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd );
SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd );
- SC_DLLPUBLIC bool IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd );
SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor );
ScAnyRefModalDlg* GetCurrentAnyRefDlg();
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 87174c1..7a471c0 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2301,18 +2301,6 @@ bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd )
return true;
}
-bool ScModule::IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd )
-{
- std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
-
- if( iSlot == m_mapRefWindow.end() )
- return false;
-
- std::list<Window*> & rlRefWindow = iSlot->second;
-
- return rlRefWindow.end() != std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd );
-}
-
Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor )
{
if (!pWndAncestor)
diff --git a/unusedcode.easy b/unusedcode.easy
index ca506a6..696482c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
BigInt::BigInt(unsigned int)
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
-Chart2ExportTest::testFdo74115WallGradientFill()
ConfigurationAccess::getPath(rtl::OUString const&)
DocxSdrExport::getFlyFrameGraphic()
DocxSdrExport::setFlyFrameGraphic(bool)
@@ -21,6 +20,7 @@ MenuBar::RemoveMenuBarButton(unsigned short)
MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&)
OpenGLContext::getOpenGLWindow()
OutputDevice::GetCanvas() const
+OutputDevice::HasAlpha()
OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
OutputDevice::LogicToPixel(Region const&, MapMode const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
@@ -36,7 +36,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
SdrItemBrowser::ForceParent()
SdrItemBrowser::SdrItemBrowser(SdrView&)
-SdrOpenGLObj::getOpenGLContext()
SdrTextObj::NbcSetAutoGrowHeight(bool)
SdrTextObj::NbcSetAutoGrowWidth(bool)
SdrTextObj::NbcSetFitToSize(SdrFitToSizeType)
@@ -56,7 +55,9 @@ StyleSettings::SetUseFlatBorders(bool)
StyleSettings::SetUseFlatMenus(bool)
SvpSalInstance::PostedEventsInQueue()
SvtListener::IsListening(SvtBroadcaster&) const
+SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>)
SvxNumberFormatShell::IsAdded_Impl(unsigned long)
+SvxUnoTextBase::SvxUnoTextBase()
SwAccessibleField::SwAccessibleField(SwField*, SwAccessibleParagraph*, short)
SwAccessibleMap::FireColumnChangeEvent(unsigned short, unsigned short)
SwAccessibleMap::FirePageChangeEvent(unsigned short, unsigned short)
@@ -188,6 +189,9 @@ basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&, do
basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&, double const&)
basegfx::unotools::homMatrixFromMatrix(basegfx::B2DHomMatrix&, com::sun::star::geometry::Matrix2D const&)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
+chart::opengl3D::Line::Line(unsigned int)
+chart::opengl3D::Rectangle::Rectangle(unsigned int)
+chart::opengl3D::Text::Text(unsigned int)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
@@ -198,6 +202,7 @@ connectivity::sdbcx::OGroup::OGroup(bool)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
+oox::drawingml::CustomShapeProperties::initializePresetDataMap()
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
sc::CLBuildKernelThread::CLBuildKernelThread()
sc::CLBuildKernelThread::consume()
@@ -205,7 +210,7 @@ sc::CLBuildKernelThread::finish()
sc::CLBuildKernelThread::produce()
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
-sdr::contact::ViewObjectContactOfOpenGLObj::getWindow() const
+sfx2::SvBaseLink::SvBaseLink(rtl::OUString const&, unsigned short, sfx2::SvLinkSource*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
commit 1de199cdcb17cba7e39dd5411c6e5048a0571600
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 18 08:42:20 2014 +0100
fix higher debug level build
Change-Id: I3b5ba865f43a93b3a293c1dbe3a50e6fbd36adea
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 928c3cb..8b6817c 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -67,7 +67,7 @@ namespace ww
const C *pBeforeEnd = mpWwSprmTab + mnNoElems - 1;
while (pIter < pBeforeEnd)
{
- if (*pIter == *(pIter+1))
+ if (pIter->nId == (pIter+1)->nId)
{
if (!bBroken)
{
@@ -90,7 +90,7 @@ namespace ww
sError += OUString(' ');
}
sError += OUString('\n');
- while (*pIter == *(pIter+1) && pIter < pBeforeEnd)
+ while (pIter->nId == (pIter+1)->nId && pIter < pBeforeEnd)
++pIter;
}
else
More information about the Libreoffice-commits
mailing list