mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some newly tagged unused methods

Browse Source 
Change-Id: Ie55dfd19f223df62c091ffc4fdf28789b308a1c7
This commit is contained in:
Julien Nabet 2012-11-23 22:32:49 +01:00
parent 5eb9c58c31
commit db4aab0e11
7 changed files with 0 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codemaker/inc/codemaker/global.hxx
View File

@ -98,8 +98,6 @@ public:
friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s); friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s);
private: private:
sal_uInt32 checkAccessMode(FileAccessMode mode);
oslFileHandle m_file; oslFileHandle m_file;
::rtl::OString m_name; ::rtl::OString m_name;
}; };

16
codemaker/source/codemaker/global.cxx
View File

@ -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) { bool FileStream::write(void const * buffer, sal_uInt64 size) {
while (size > 0) { while (size > 0) {
sal_uInt64 written; sal_uInt64 written;

4
l10ntools/inc/helpmerge.hxx
View File

@ -49,19 +49,15 @@ public:
static bool CreateSDF( const rtl::OString &rSDFFile_in, const rtl::OString &rPrj_in, const rtl::OString &rRoot_in, 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 ); 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 /// Method merges the String from the SDFfile into XMLfile. Both Strings must
/// point to existing files. /// point to existing files.
bool Merge( const rtl::OString &rSDFFile_in, const rtl::OString &rDestinationFile_in , bool Merge( const rtl::OString &rSDFFile_in, const rtl::OString &rDestinationFile_in ,
const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile ); const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile );
private: 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 ); 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 ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
void MakeDir(const rtl::OString& rPath);
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

64
l10ntools/source/helpmerge.cxx
View File

@ -198,35 +198,6 @@ bool HelpParser::Merge( const rtl::OString &rSDFFile, const rtl::OString &rDesti
return hasNoError; 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 , bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage ,
rtl::OString const & sPath ) rtl::OString const & sPath )
{ {
@ -257,41 +228,6 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
return true; 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*/ /* 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 ){ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){

5
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
View File

@ -84,11 +84,6 @@ void OGLTransitionImpl::setScene(TransitionScene const& rScene)
maScene = rScene; maScene = rScene;
} }
void OGLTransitionImpl::clearScene()
{
maScene.clear();
}
void OGLTransitionImpl::prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ) void OGLTransitionImpl::prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex )
{ {
const SceneObjects_t& rSceneObjects(maScene.getSceneObjects()); const SceneObjects_t& rSceneObjects(maScene.getSceneObjects());

2
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
View File

@ -175,8 +175,6 @@ protected:
void setScene(TransitionScene const& rScene); void setScene(TransitionScene const& rScene);
// void setSettings(TransitionSettings const& rSettings); // void setSettings(TransitionSettings const& rSettings);
void clearScene();
void displaySlide( double nTime, ::sal_Int32 glSlideTex, const Primitives_t& primitives, double SlideWidthScale, double SlideHeightScale ); 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 displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale ); void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );

5
unusedcode.easy
View File

@ -1,13 +1,8 @@
FileStream::checkAccessMode(FileAccessMode)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
GraphicObject::SwapIn(SvStream*) 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&) LiblantagDataRef::presetDataPath(rtl::OUString const&)
Line::GetLength() const Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const Line::Intersection(Rectangle const&, Line&) const
OGLTransitionImpl::clearScene()
PoHeader::getLanguage() const PoHeader::getLanguage() const
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS() ScFiltersTest::testColorScaleODS()