[Libreoffice-commits] .: 2 commits - cosv/inc cosv/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jun 28 01:15:55 PDT 2011
cosv/inc/cosv/datetime.hxx | 80 ---------------------------------------
cosv/inc/cosv/dirchain.hxx | 16 -------
cosv/inc/cosv/string.hxx | 16 -------
cosv/source/service/datetime.cxx | 58 ----------------------------
cosv/source/service/makefile.mk | 1
cosv/source/storage/dirchain.cxx | 12 -----
6 files changed, 183 deletions(-)
New commits:
commit 030d3404280d3df56a7f6fc2cf9f729eb42ba365
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 27 23:09:24 2011 +0100
ditch unused code
diff --git a/cosv/inc/cosv/dirchain.hxx b/cosv/inc/cosv/dirchain.hxx
index 7a04d38..b40a708 100644
--- a/cosv/inc/cosv/dirchain.hxx
+++ b/cosv/inc/cosv/dirchain.hxx
@@ -96,9 +96,6 @@ class DirectoryChain
const String & Back() const;
void Get(
- ostream & o_rPath,
- const char * i_sDelimiter ) const;
- void Get(
bostream & o_rPath,
const char * i_sDelimiter ) const;
private:
@@ -145,15 +142,6 @@ DirectoryChain::Back() const
} // namespace ploc
} // namespace csv
-
-inline csv::ostream &
-operator<<( csv::ostream & o_rOut,
- const csv::ploc::DirectoryChain & i_rSubPath )
-{
- i_rSubPath.Get(o_rOut, csv::ploc::Delimiter());
- return o_rOut;
-}
-
inline csv::bostream &
operator<<( csv::bostream & o_rOut,
const csv::ploc::DirectoryChain & i_rSubPath )
@@ -162,10 +150,6 @@ operator<<( csv::bostream & o_rOut,
return o_rOut;
}
-
-
#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cosv/inc/cosv/string.hxx b/cosv/inc/cosv/string.hxx
index bc6b61e..08b1220 100644
--- a/cosv/inc/cosv/string.hxx
+++ b/cosv/inc/cosv/string.hxx
@@ -247,16 +247,6 @@ int compare(
const CharOrder_Table & i_rOrder,
const char * i_s1,
const char * i_s2 );
-
- //*** Defined order, substrings
-
-int compare(
- const CharOrder_Table & i_rOrder,
- const char * i_s1,
- const char * i_s2,
- csv::str::size i_nLength );
-
-
} // namespace csv
@@ -506,9 +496,6 @@ operator<<( csv::ostream & o_rOut,
{ o_rOut << i_rSrc.c_str(); return o_rOut; }
-
-
-
//****************** typedefs *********************//
namespace csv
@@ -518,9 +505,6 @@ typedef std::vector<String> StringVector;
}
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cosv/source/storage/dirchain.cxx b/cosv/source/storage/dirchain.cxx
index ff83ac9..fadc1bf 100644
--- a/cosv/source/storage/dirchain.cxx
+++ b/cosv/source/storage/dirchain.cxx
@@ -95,18 +95,6 @@ DirectoryChain::PopBack( uintt i_nCount )
}
void
-DirectoryChain::Get( ostream & o_rPath,
- const char * i_sDelimiter ) const
-{
- for ( std::vector<String>::const_iterator it = aPath.begin();
- it != aPath.end();
- ++it )
- {
- o_rPath << (*it).c_str() << i_sDelimiter;
- }
-}
-
-void
DirectoryChain::Get( bostream & o_rPath,
const char * i_sDelimiter ) const
{
commit f85363b6f4515e0ba03ab2a49402911274e72dd9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 27 22:45:19 2011 +0100
remove unused datetime
diff --git a/cosv/inc/cosv/datetime.hxx b/cosv/inc/cosv/datetime.hxx
deleted file mode 100644
index 8e852f1..0000000
--- a/cosv/inc/cosv/datetime.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CSV_DATETIME_HXX
-#define CSV_DATETIME_HXX
-
-
-
-namespace csv
-{
-
-
-class Date
-{
- public:
- Date(
- unsigned i_nDay,
- unsigned i_nMonth,
- unsigned i_nYear );
-
- unsigned Day() const { return nData >> 24; }
- unsigned Month() const { return (nData & 0x00FF0000) >> 16; }
- unsigned Year() const { return nData & 0x0000FFFF; }
-
- private:
- UINT32 nData;
-};
-
-class Time
-{
- public:
- Time(
- unsigned i_nHour,
- unsigned i_nMinutes,
- unsigned i_nSeconds = 0,
- unsigned i_nSeconds100 = 0 );
-
- unsigned Hour() const { return nData >> 24; }
- unsigned Minutes() const { return (nData & 0x00FF0000) >> 16; }
- unsigned Seconds() const { return (nData & 0x0000FF00) >> 8; }
- unsigned Seconds100() const { return nData & 0x000000FF; }
-
- private:
- UINT32 nData;
-};
-
-
-} // namespace csv
-
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cosv/source/service/datetime.cxx b/cosv/source/service/datetime.cxx
deleted file mode 100644
index ad00806..0000000
--- a/cosv/source/service/datetime.cxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <precomp.h>
-#include <cosv/datetime.hxx>
-
-
-// NOT FULLY DECLARED SERVICES
-
-
-namespace csv
-{
-
-Date::Date( unsigned i_nDay,
- unsigned i_nMonth,
- unsigned i_nYear )
- : nData( (i_nDay << 24) + (i_nMonth << 16) + i_nYear )
-{
-}
-
-Time::Time( unsigned i_nHour,
- unsigned i_nMinutes,
- unsigned i_nSeconds,
- unsigned i_nSeconds100 )
- : nData( (i_nHour << 24) + (i_nMinutes << 16) + (i_nSeconds << 8) + i_nSeconds100 )
-{
-}
-
-} // namespace csv
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cosv/source/service/makefile.mk b/cosv/source/service/makefile.mk
index fc44f35..fecfb63 100644
--- a/cosv/source/service/makefile.mk
+++ b/cosv/source/service/makefile.mk
@@ -47,7 +47,6 @@ OBJFILES= \
$(OBJ)$/comdline.obj \
$(OBJ)$/comfunc.obj \
$(OBJ)$/csv_ostream.obj \
- $(OBJ)$/datetime.obj \
$(OBJ)$/std_outp.obj
More information about the Libreoffice-commits
mailing list