diff options
| -rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 10 | ||||
| -rw-r--r-- | cui/source/inc/SpellDialog.hxx | 1 | ||||
| -rw-r--r-- | svx/inc/svx/numvset.hxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 12 | ||||
| -rw-r--r-- | unusedcode.easy | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 1 | ||||
| -rw-r--r-- | writerfilter/inc/doctok/WW8Document.hxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/doctok/analyzer.xsl | 27 | ||||
| -rw-r--r-- | writerfilter/source/doctok/qnametostr.xsl | 2 | ||||
| -rw-r--r-- | writerfilter/source/doctok/resourcetools.xsl | 105 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/qnametostr.xsl | 34 |
12 files changed, 0 insertions, 207 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 4fa2cfe9b1af..c3e3f4fdeeea 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1190,16 +1190,6 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe } //----------------------------------------------------------------------- -SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window* pParent, const ResId& rResId) - : MultiLineEdit(pParent, rResId) - , m_nErrorStart(0) - , m_nErrorEnd(0) - , m_bIsUndoEditMode(false) -{ - DisableSelectionOnFocus(); -} - -//----------------------------------------------------------------------- SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits) : MultiLineEdit(pParent, nBits) , m_nErrorStart(0) diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index d3004d2bddd8..5cfeeaa1ccc1 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -75,7 +75,6 @@ protected: virtual long PreNotify( NotifyEvent& rNEvt ); public: - SentenceEditWindow_Impl(Window* pParent, const ResId& rResId); SentenceEditWindow_Impl(Window* pParent, WinBits nBits); ~SentenceEditWindow_Impl(); diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx index b86df153df49..53d6b12a1f42 100644 --- a/svx/inc/svx/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -66,7 +66,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::container::XIndexAccess> > aOutlineSettings; public: - SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ); SvxNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); void init(sal_uInt16 nType); ~SvxNumValueSet(); @@ -106,7 +105,6 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet(Window* pParent, const ResId& rResId); SvxBmpNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); ~SvxBmpNumValueSet(); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 4fe34b455a4c..42179ab528e9 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -393,12 +393,6 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) - : ValueSet( pParent, rResId ) -{ - init(nType); -} - SvxNumValueSet::SvxNumValueSet(Window* pParent, WinBits nWinBits) : ValueSet(pParent, nWinBits) { @@ -470,12 +464,6 @@ void SvxNumValueSet::SetOutlineNumberingSettings( } } -SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) - : SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ) -{ - init(); -} - SvxBmpNumValueSet::SvxBmpNumValueSet(Window* pParent, WinBits nWinBits) : SvxNumValueSet(pParent, nWinBits) { diff --git a/unusedcode.easy b/unusedcode.easy index 8c8c30f75b2c..b860adcdea86 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -54,9 +54,5 @@ unicode::isDigit(unsigned short) unicode::isLower(unsigned short) unicode::isPrint(unsigned short) unicode::isUpper(unsigned short) -writerfilter::doctokidsToXML(std::basic_ostream<char, std::char_traits<char> >&) writerfilter::logger(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >) -writerfilter::ooxmlidsToXML(std::basic_ostream<char, std::char_traits<char> >&) -writerfilter::ooxmlsprmidsToXML(std::basic_ostream<char, std::char_traits<char> >&) writerfilter::rtftok::RTFSprms::swap(writerfilter::rtftok::RTFSprms&) -writerfilter::sprmidsToXML(std::basic_ostream<char, std::char_traits<char> >&) diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 2481e314c9d5..992814399bc6 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -256,9 +256,4 @@ void SAL_CALL SalGtkPicker::implsetTitle( const rtl::OUString& aTitle ) throw( u gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() ); } -uno::Reference< uno::XInterface > SalGtkPicker::createInstance( const rtl::OUString &rName ) -{ - return m_xContext->getServiceManager()->createInstanceWithContext( rName, m_xContext ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 64f37b6345bf..196e8e901f6b 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -61,7 +61,6 @@ class SalGtkPicker // to instantiate own services ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createInstance( const rtl::OUString &rName ); rtl::OUString getResString( sal_Int32 aId ); private: diff --git a/writerfilter/inc/doctok/WW8Document.hxx b/writerfilter/inc/doctok/WW8Document.hxx index e9e8ac60c90a..b624ce710dc2 100644 --- a/writerfilter/inc/doctok/WW8Document.hxx +++ b/writerfilter/inc/doctok/WW8Document.hxx @@ -427,10 +427,6 @@ public: createDocument(WW8Stream::Pointer_t rpStream); }; -void sprmidsToXML(::std::iostream & out); - -void doctokidsToXML(::std::iostream & out); - }} #endif // INCLUDED_WW8_DOCUMENT_HXX diff --git a/writerfilter/source/doctok/analyzer.xsl b/writerfilter/source/doctok/analyzer.xsl deleted file mode 100644 index 049150cf81f3..000000000000 --- a/writerfilter/source/doctok/analyzer.xsl +++ /dev/null @@ -1,27 +0,0 @@ -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default"> -<xsl:output method="text" /> -<xsl:include href="resourcetools.xsl"/> - -<xsl:template match="/"> - <xsl:call-template name="analyzerdoctokids"/> -</xsl:template> - -</xsl:stylesheet>
\ No newline at end of file diff --git a/writerfilter/source/doctok/qnametostr.xsl b/writerfilter/source/doctok/qnametostr.xsl index e3009c952cde..a101fb3700b2 100644 --- a/writerfilter/source/doctok/qnametostr.xsl +++ b/writerfilter/source/doctok/qnametostr.xsl @@ -28,8 +28,6 @@ namespace writerfilter { <xsl:apply-templates select=".//UML:Model" mode="qnametostr"/> - <xsl:apply-templates select='.//UML:Model' mode='sprmidstoxml'/> - <xsl:apply-templates select='.//UML:Model' mode='analyzerdoctokids'/> } </xsl:template> </xsl:stylesheet> diff --git a/writerfilter/source/doctok/resourcetools.xsl b/writerfilter/source/doctok/resourcetools.xsl index f3df28d1a1db..7218b5dd1344 100644 --- a/writerfilter/source/doctok/resourcetools.xsl +++ b/writerfilter/source/doctok/resourcetools.xsl @@ -371,34 +371,6 @@ namespace NS_sprm { </xsl:text> <xsl:text> | cat
</xsl:text> </xsl:template> -<xsl:template match="UML:Model" mode="sprmidstoxml"> - <xsl:text> -void sprmidsToXML(::std::ostream & out) -{ - </xsl:text> - <xsl:for-each select=".//UML:Class[.//UML:Stereotype/@xmi.idref='ww8sprm']"> - <xsl:variable name="sprmcode"> - <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref = 'sprmcode']/UML:TaggedValue.dataValue"/> - </xsl:variable> - <xsl:variable name="sprmcodelower"> - <xsl:value-of select="translate($sprmcode, 'ABCDEF', 'abcdef')"/> - </xsl:variable> - <xsl:variable name="sprmidname"> - <xsl:text>sprm:</xsl:text> - <xsl:value-of select="substring-after(@name, 'sprm')"/> - </xsl:variable> - <xsl:text> - out << "<theid name=\"</xsl:text> - <xsl:value-of select="$sprmidname"/> - <xsl:text>\"></xsl:text> - <xsl:value-of select="$sprmcodelower"/> - <xsl:text></theid>" << endl;</xsl:text> - </xsl:for-each> - <xsl:text> -} - </xsl:text> -</xsl:template> - <xsl:template match="UML:Model" mode='sprmreplace'> <xsl:for-each select=".//UML:Class[.//UML:Stereotype/@xmi.idref='ww8sprm']"> <xsl:variable name="pattern"> @@ -439,83 +411,6 @@ sed "s/</xsl:text> <xsl:key name="same-valued-tagged-data" match="UML:TaggedValue.dataValue" use="." /> -<xsl:template name="analyzerdoctokidsattrs"> - <xsl:text> - /* Attributes */</xsl:text> - <xsl:for-each select='.//UML:Attribute[@name!="reserved"]'> - <xsl:if test='count(.//UML:Stereotype[@xmi.idref="noqname"]) = 0'> - <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="attrid"]'> - <xsl:choose> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <xsl:otherwise> - <xsl:text> - out << "<theid name=\"</xsl:text> - <xsl:value-of select=".//UML:TaggedValue.dataValue"/> - <xsl:text>\"></xsl:text> - <xsl:value-of select='10000 + position()'/> - <xsl:text></theid>" << endl;</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </xsl:if> - </xsl:for-each> -</xsl:template> - -<xsl:template name="analyzerdoctokidsops"> - <xsl:text> - /* Operations */</xsl:text> - <xsl:for-each select='.//UML:Operation[@name!="reserved"]'> - <xsl:if test='count(.//UML:Stereotype[@xmi.idref="noqname"]) = 0'> - <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="opid"]'> - <xsl:choose> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <xsl:otherwise> - <xsl:text> - out << "<theid name=\"</xsl:text> - <xsl:value-of select=".//UML:TaggedValue.dataValue"/> - <xsl:text>\"></xsl:text> - <xsl:value-of select='20000 + position()'/> - <xsl:text></theid>" << endl;</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </xsl:if> - </xsl:for-each> -</xsl:template> - -<xsl:template name="analyzerdoctokidsclasses"> - <xsl:text> - /* clases */</xsl:text> - <xsl:for-each select='.//UML:Class[@name!="reserved"]'> - <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="classid"]'> - <xsl:choose> - <xsl:when test='.//UML:Stereotype[@xmi.idref="noqname"]'/> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <xsl:otherwise> - <xsl:text> - out << "<theid name=\"</xsl:text> - <xsl:value-of select=".//UML:TaggedValue.dataValue"/> - <xsl:text>\"></xsl:text> - <xsl:value-of select='30000 + position()'/> - <xsl:text></theid>" << endl;</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </xsl:for-each> -</xsl:template> - -<xsl:template match="UML:Model" mode="analyzerdoctokids"> - <xsl:text> -void doctokidsToXML(::std::ostream & out) -{</xsl:text> -<xsl:call-template name="analyzerdoctokidsattrs"/> -<xsl:call-template name="analyzerdoctokidsops"/> -<xsl:call-template name="analyzerdoctokidsclasses"/> -<xsl:text> -} - </xsl:text> -</xsl:template> - <xsl:template name="licenseheader"> <xsl:text> /* diff --git a/writerfilter/source/ooxml/qnametostr.xsl b/writerfilter/source/ooxml/qnametostr.xsl index a7a7d6c4aa93..5d09c8b245f2 100644 --- a/writerfilter/source/ooxml/qnametostr.xsl +++ b/writerfilter/source/ooxml/qnametostr.xsl @@ -79,39 +79,6 @@ void QNameToString::init_ooxml() </xsl:text> </xsl:template> - <xsl:template name="ooxmlidstoxml"> - <xsl:text> -void ooxmlsprmidsToXML(::std::ostream & out) -{</xsl:text> - <xsl:for-each select="//@tokenid"> - <xsl:if test="contains(., 'ooxml:') and generate-id(.) = generate-id(key('tokenids', .)[1]) and ancestor::element"> - <xsl:text> - out << "<theid name=\"</xsl:text> - <xsl:value-of select="."/> - <xsl:text>\"></xsl:text> - <xsl:value-of select="90000 + position()"/> - <xsl:text></theid>" << endl; </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text> -}</xsl:text> - <xsl:text> -void ooxmlidsToXML(::std::ostream & out) -{</xsl:text> - <xsl:for-each select="//@tokenid"> - <xsl:if test="contains(., 'ooxml:') and generate-id(.) = generate-id(key('tokenids', .)[1]) and ancestor::attribute"> - <xsl:text> - out << "<theid name=\"</xsl:text> - <xsl:value-of select="."/> - <xsl:text>\"></xsl:text> - <xsl:value-of select="90000 + position()"/> - <xsl:text></theid>" << endl; </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text> -}</xsl:text> - </xsl:template> - <xsl:template match="/"> #include "ooxml/resourceids.hxx" #include "resourcemodel/QNameToString.hxx" @@ -119,7 +86,6 @@ void ooxmlidsToXML(::std::ostream & out) namespace writerfilter { <xsl:call-template name="qnametostr"/> - <xsl:call-template name="ooxmlidstoxml"/> } </xsl:template> |