[Libreoffice-commits] .: 2 commits - codemaker/inc codemaker/source l10ntools/inc l10ntools/source oox/inc oox/source slideshow/source unusedcode.easy
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 23 13:53:33 PST 2012
codemaker/inc/codemaker/global.hxx | 2
codemaker/source/codemaker/global.cxx | 16 --
l10ntools/inc/helpmerge.hxx | 4
l10ntools/source/helpmerge.cxx | 64 ----------
oox/inc/oox/ole/vbacontrol.hxx | 6
oox/source/ole/vbacontrol.cxx | 5
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 5
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx | 2
unusedcode.easy | 6
9 files changed, 110 deletions(-)
New commits:
commit e40e6b26eb020683769e06530820d9dcdde30830
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Fri Nov 23 22:52:05 2012 +0100
Remove some other newly tagged unused methods
Change-Id: I6413fa7b9a7ca5e5f88c634ac4a7092162a9a9c9
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 9edd454..b9f3975 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -74,12 +74,6 @@ public:
ApiControlType eCtrlType,
sal_Int32 nCtrlIndex ) const;
- /** Binds the passed control model to the data sources. The implementation
- will check which source types are supported. */
- void bindToSources(
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
- const ControlConverter& rConv ) const;
-
protected:
::rtl::OUString maName; ///< Name of the control.
::rtl::OUString maTag; ///< User defined tag.
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 5e109b0..607b8e6 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -316,11 +316,6 @@ void VbaSiteModel::convertProperties( PropertyMap& rPropMap,
}
}
-void VbaSiteModel::bindToSources( const Reference< XControlModel >& rxCtrlModel, const ControlConverter& rConv ) const
-{
- rConv.bindToSources( rxCtrlModel, maControlSource, maRowSource );
-}
-
// ============================================================================
VbaFormControl::VbaFormControl()
diff --git a/unusedcode.easy b/unusedcode.easy
index f335d0a..a3e78d5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -52,7 +52,6 @@ desktop::Lockfile::clean()
framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
-oox::ole::VbaSiteModel::bindToSources(com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> const&, oox::ole::ControlConverter const&) const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::FormulaProcessorBase::generateRangeList2dString(oox::xls::ApiCellRangeList const&, bool, unsigned short, bool)
sc_apitest::main()
commit db4aab0e114df7eda1a53a218de41a38c5bde7f2
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Fri Nov 23 22:32:49 2012 +0100
Remove some newly tagged unused methods
Change-Id: Ie55dfd19f223df62c091ffc4fdf28789b308a1c7
diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx
index 359596d..f4eff3d 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -98,8 +98,6 @@ public:
friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s);
private:
- sal_uInt32 checkAccessMode(FileAccessMode mode);
-
oslFileHandle m_file;
::rtl::OString m_name;
};
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 35d7ed0..34b0490 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -340,22 +340,6 @@ void FileStream::close()
}
}
-sal_uInt32 FileStream::checkAccessMode(FileAccessMode mode)
-{
- switch( mode )
- {
- case FAM_READ:
- return osl_File_OpenFlag_Read;
- case FAM_WRITE:
- return osl_File_OpenFlag_Write;
- case FAM_READWRITE_EXIST:
- return osl_File_OpenFlag_Read | osl_File_OpenFlag_Write;
- case FAM_READWRITE:
- return osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create;
- }
- return osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create;
-}
-
bool FileStream::write(void const * buffer, sal_uInt64 size) {
while (size > 0) {
sal_uInt64 written;
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 401f839..aefc873 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -49,19 +49,15 @@ public:
static bool CreateSDF( const rtl::OString &rSDFFile_in, const rtl::OString &rPrj_in, const rtl::OString &rRoot_in,
const rtl::OString &sHelpFile, XMLFile *pXmlFile, const rtl::OString &rGsi1 );
- static void parse_languages( std::vector<rtl::OString>& aLanguages , MergeDataFile& aMergeDataFile );
-
/// Method merges the String from the SDFfile into XMLfile. Both Strings must
/// point to existing files.
bool Merge( const rtl::OString &rSDFFile_in, const rtl::OString &rDestinationFile_in ,
const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile );
private:
- rtl::OString GetOutpath( const rtl::OString& rPathX , const rtl::OString& sCur , const rtl::OString& rPathY );
bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage , rtl::OString const & sPath );
void ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
- void MakeDir(const rtl::OString& rPath);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 68f7453..3173785 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -198,35 +198,6 @@ bool HelpParser::Merge( const rtl::OString &rSDFFile, const rtl::OString &rDesti
return hasNoError;
}
-void HelpParser::parse_languages( std::vector<rtl::OString>& aLanguages , MergeDataFile& aMergeDataFile ){
- std::vector<rtl::OString> aTmp;
-
- Export::InitLanguages( false );
-
- if (Export::sLanguages.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")))
- {
- aLanguages = aMergeDataFile.GetLanguages();
- aLanguages.push_back(rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US")));
-
- if( !Export::sForcedLanguages.isEmpty() )
- {
- std::vector<rtl::OString> aFL = Export::GetForcedLanguages();
- std::copy( aFL.begin() ,
- aFL.end() ,
- back_inserter( aLanguages )
- );
- std::sort( aLanguages.begin() , aLanguages.end() , std::less< rtl::OString >() );
- std::vector<rtl::OString>::iterator unique_iter = std::unique( aLanguages.begin() , aLanguages.end() , std::equal_to< rtl::OString >() );
- std::copy( aLanguages.begin() , unique_iter , back_inserter( aTmp ) );
- aLanguages = aTmp;
- }
- }
- else{
- aLanguages = Export::GetLanguages();
- }
-
-}
-
bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage ,
rtl::OString const & sPath )
{
@@ -257,41 +228,6 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
return true;
}
-rtl::OString HelpParser::GetOutpath( const rtl::OString& rPathX , const rtl::OString& sCur , const rtl::OString& rPathY )
-{
- rtl::OString testpath = rPathX;
- if (!testpath.endsWithL(RTL_CONSTASCII_STRINGPARAM("/"))) {
- testpath += "/";
- }
- testpath += sCur;
- testpath += "/";
- rtl::OString sRelativePath( rPathY );
- if (sRelativePath.matchL(RTL_CONSTASCII_STRINGPARAM("/"))) {
- sRelativePath = sRelativePath.copy(1);
- }
- testpath += sRelativePath;
- testpath += "/";
- return testpath;
-}
-
-void HelpParser::MakeDir(const rtl::OString& rPath)
-{
- rtl::OString sTPath(rPath.replaceAll("\\", "/"));
- sal_Int32 cnt = helper::countOccurrences(sTPath, '/');
- rtl::OStringBuffer sCreateDir;
- for (sal_uInt16 i = 0; i <= cnt; ++i)
- {
- sCreateDir.append(sTPath.getToken(i , '/'));
- sCreateDir.append('/');
-#ifdef WNT
- _mkdir( sCreateDir.getStr() );
-#else
- mkdir( sCreateDir.getStr() , S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH );
-#endif
- }
-}
-
-
/* ProcessHelp Methode: search for en-US entry and replace it with the current language*/
void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index 14b999a..491381c 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -84,11 +84,6 @@ void OGLTransitionImpl::setScene(TransitionScene const& rScene)
maScene = rScene;
}
-void OGLTransitionImpl::clearScene()
-{
- maScene.clear();
-}
-
void OGLTransitionImpl::prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex )
{
const SceneObjects_t& rSceneObjects(maScene.getSceneObjects());
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
index af81d79..0724de5 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
@@ -175,8 +175,6 @@ protected:
void setScene(TransitionScene const& rScene);
// void setSettings(TransitionSettings const& rSettings);
- void clearScene();
-
void displaySlide( double nTime, ::sal_Int32 glSlideTex, const Primitives_t& primitives, double SlideWidthScale, double SlideHeightScale );
void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );
diff --git a/unusedcode.easy b/unusedcode.easy
index af3fe87..f335d0a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,13 +1,8 @@
-FileStream::checkAccessMode(FileAccessMode)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
GraphicObject::SwapIn(SvStream*)
-HelpParser::GetOutpath(rtl::OString const&, rtl::OString const&, rtl::OString const&)
-HelpParser::MakeDir(rtl::OString const&)
-HelpParser::parse_languages(std::__debug::vector<rtl::OString, std::allocator<rtl::OString> >&, MergeDataFile&)
LiblantagDataRef::presetDataPath(rtl::OUString const&)
Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const
-OGLTransitionImpl::clearScene()
PoHeader::getLanguage() const
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
More information about the Libreoffice-commits
mailing list