[Libreoffice-commits] .: 10 commits - connectivity/source dbaccess/AllLangResTarget_adabasui.mk dbaccess/AllLangResTarget_dbui.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/inc dbaccess/Library_adabasui.mk dbaccess/Library_dbui.mk dbaccess/Library_dbu.mk dbaccess/source dbaccess/util odk/examples Repository.mk scp2/source sd/source testtools/source toolkit/inc toolkit/Library_tk.mk toolkit/Package_inc.mk toolkit/source tools/bootstrp tools/source unusedcode.easy vcl/aqua vcl/generic vcl/ios vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Feb 19 05:42:43 PST 2012
Repository.mk | 2
connectivity/source/drivers/dbase/DTable.cxx | 15
connectivity/source/inc/resource/adabas_res.hrc | 43 -
connectivity/source/inc/resource/conn_shared_res.hrc | 3
connectivity/source/resource/conn_shared_res.src | 19
dbaccess/AllLangResTarget_adabasui.mk | 47 -
dbaccess/AllLangResTarget_dbu.mk | 1
dbaccess/AllLangResTarget_dbui.mk | 1
dbaccess/Library_adabasui.mk | 71 -
dbaccess/Library_dbu.mk | 1
dbaccess/Library_dbui.mk | 1
dbaccess/inc/dbaccess_helpid.hrc | 28
dbaccess/source/core/dataaccess/ModelImpl.cxx | 6
dbaccess/source/core/inc/dbamiscres.hrc | 2
dbaccess/source/core/misc/dsntypes.cxx | 10
dbaccess/source/ext/adabas/ANewDb.cxx | 151 ---
dbaccess/source/ext/adabas/ANewDb.hxx | 97 --
dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 59 -
dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 80 --
dbaccess/source/ext/adabas/Acomponentmodule.cxx | 295 -------
dbaccess/source/ext/adabas/Acomponentmodule.hxx | 265 ------
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 752 -------------------
dbaccess/source/ext/adabas/AdabasNewDb.hrc | 78 -
dbaccess/source/ext/adabas/AdabasNewDb.hxx | 151 ---
dbaccess/source/ext/adabas/AdabasNewDb.src | 475 ------------
dbaccess/source/ext/adabas/Aservices.cxx | 80 --
dbaccess/source/ext/adabas/Astringconstants.cxx | 62 -
dbaccess/source/ext/adabas/Astringconstants.hrc | 103 --
dbaccess/source/ext/adabas/adabasui.component | 34
dbaccess/source/ext/adabas/adabasui_resource.hrc | 92 --
dbaccess/source/ext/adabas/adabasuistrings.cxx | 37
dbaccess/source/ext/adabas/adabasuistrings.hrc | 42 -
dbaccess/source/inc/dsntypes.hxx | 4
dbaccess/source/inc/stringconstants.hrc | 2
dbaccess/source/inc/stringconstants.inc | 2
dbaccess/source/ui/dlg/AdabasPage.hrc | 50 -
dbaccess/source/ui/dlg/AdabasStat.cxx | 303 -------
dbaccess/source/ui/dlg/AdabasStat.hrc | 52 -
dbaccess/source/ui/dlg/AdabasStat.hxx | 86 --
dbaccess/source/ui/dlg/AdabasStat.src | 208 -----
dbaccess/source/ui/dlg/AutoControls.src | 5
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 174 ----
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 4
dbaccess/source/ui/dlg/ConnectionPage.hrc | 2
dbaccess/source/ui/dlg/ConnectionPage.src | 5
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 7
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 1
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 18
dbaccess/source/ui/dlg/DriverSettings.hxx | 4
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 1
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/dlg/dbadmin.cxx | 8
dbaccess/source/ui/dlg/dbadmin.src | 124 ---
dbaccess/source/ui/dlg/dbadminsetup.hrc | 8
dbaccess/source/ui/dlg/dbadminsetup.src | 25
dbaccess/source/ui/dlg/dbwiz.cxx | 8
dbaccess/source/ui/dlg/dbwizsetup.cxx | 10
dbaccess/source/ui/dlg/detailpages.cxx | 172 ----
dbaccess/source/ui/dlg/detailpages.hxx | 41 -
dbaccess/source/ui/dlg/dsselect.cxx | 104 --
dbaccess/source/ui/dlg/dsselect.hxx | 4
dbaccess/source/ui/inc/dbu_dlg.hrc | 18
dbaccess/source/ui/inc/dbu_resource.hrc | 10
dbaccess/source/ui/inc/dbwizsetup.hxx | 1
dbaccess/source/ui/misc/dbumiscres.hrc | 2
dbaccess/source/ui/uno/AdabasSettingsDlg.cxx | 127 ---
dbaccess/source/ui/uno/AdabasSettingsDlg.hxx | 82 --
dbaccess/util/hidother.src | 24
odk/examples/DevelopersGuide/Database/Sales.java | 8
scp2/source/base/module_base.scp | 2
sd/source/filter/eppt/pptx-text.cxx | 4
sd/source/filter/eppt/text.hxx | 2
testtools/source/bridgetest/cli/cli_cs_testobj.cs | 2
toolkit/Library_tk.mk | 1
toolkit/Package_inc.mk | 1
toolkit/inc/toolkit/helper/unomemorystream.hxx | 75 -
toolkit/source/controls/unocontrols.cxx | 1
toolkit/source/helper/unomemorystream.cxx | 108 --
tools/bootstrp/addexes/replace.cxx | 77 -
tools/bootstrp/mkunroll/mkunroll.cxx | 5
tools/source/fsys/unx.cxx | 6
unusedcode.easy | 34
vcl/aqua/source/app/salinst.cxx | 36
vcl/aqua/source/gdi/salatslayout.cxx | 4
vcl/aqua/source/gdi/salatsuifontutils.cxx | 143 +--
vcl/aqua/source/gdi/salgdi.cxx | 6
vcl/generic/fontmanager/fontmanager.cxx | 96 +-
vcl/generic/fontmanager/helper.cxx | 18
vcl/ios/source/app/salinst.cxx | 27
vcl/ios/source/gdi/salgdi.cxx | 6
vcl/unx/generic/app/salinst.cxx | 9
vcl/unx/generic/printer/ppdparser.cxx | 84 +-
vcl/unx/generic/printer/printerinfomanager.cxx | 24
94 files changed, 294 insertions(+), 5288 deletions(-)
New commits:
commit 777f63d448dd22c32f8644256ccbf843bc81f48b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 19 13:42:04 2012 +0000
method should be public
diff --git a/testtools/source/bridgetest/cli/cli_cs_testobj.cs b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
index f89241b..941e35b 100644
--- a/testtools/source/bridgetest/cli/cli_cs_testobj.cs
+++ b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
@@ -264,7 +264,7 @@ public class BridgeTestObject : WeakBase, XRecursiveCall, XBridgeTest2
return i2;
}
- double testTenDoubles( double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, double d9, double d10 )
+ public double testTenDoubles( double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, double d9, double d10 )
{
return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10;
}
commit fe4c4480b871b2122a90a6a7d0bcd47036a7f437
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 19 11:15:07 2012 +0000
callcatcher: update list
diff --git a/unusedcode.easy b/unusedcode.easy
index a4136b8..eb5cec5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,8 @@
+Button::ImplGetSymbolAlign() const
+ByteString::Assign(char const*)
+ByteString::EqualsIgnoreCaseAscii(char const*) const
+ByteString::SearchAndReplace(ByteString const&, ByteString const&, unsigned short)
+ByteString::SearchAndReplace(char const*, ByteString const&, unsigned short)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short)
CharPosArray::Replace(int const&, unsigned short)
@@ -5,6 +10,7 @@ CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
Dialog::Dialog(Window*, ResId const&)
DirEntry::SetBase(String const&, char)
+Export::DumpExportList(rtl::OString const&, ExportList&)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
@@ -23,7 +29,9 @@ HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
HTMLControls::Remove(HTMLControl const*&, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
+ImpSvMEdit::GetTextLines() const
ImpSvtData::~ImpSvtData()
+ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
@@ -34,8 +42,6 @@ MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
MSDffImportRecords::Remove(unsigned short, unsigned short)
-MSFilterTracer::SetProperty(rtl::OUString const&, com::sun::star::uno::Any const&)
-MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>)
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
@@ -163,13 +169,10 @@ SfxUINT32s::Remove(unsigned short, unsigned short)
SfxUINT32s::Replace(unsigned int const&, unsigned short)
SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-SfxULongRangeItem::SfxULongRangeItem(unsigned short, SvStream&)
SfxULongRanges::SfxULongRanges(int, int, int, ...)
SfxULongRanges::SfxULongRanges(unsigned long const*)
SfxULongRanges::SfxULongRanges(unsigned long, unsigned long)
SfxULongRangesItem::SfxULongRangesItem(unsigned short, unsigned int const*)
-SfxUShortRanges::Contains(unsigned short) const
-SfxUShortRanges::Intersects(SfxUShortRanges const&) const
SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
Slider::SetRangeMax(long)
@@ -458,7 +461,7 @@ TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char
TaskBar::TaskBar(Window*, long)
TaskStatusFieldItem::TaskStatusFieldItem()
TempFile::IsValid() const
-TextObj::TextObj(TextObj&)
+TextEngine::GetLeftMargin() const
TextObj::Write(SvStream*)
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
@@ -473,7 +476,6 @@ UnoControlModel::UnoControlModel()
UnoControlModel::getInfoHelper()
UnoListBoxControl::getActionListeners()
UnoListBoxControl::getItemListeners()
-UnoMemoryStream::UnoMemoryStream(unsigned int, unsigned int)
VCLUnoHelper::CreatePointer()
VCLXDevice::IsCreatedWithToolkit() const
VCLXPrinterServer::getImplementationId()
@@ -628,18 +630,15 @@ basegfx::tools::createSimplifiedPolygon(basegfx::B2DPolygon const&)
basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&)
basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&)
-basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&)
basegfx::tools::findCut(basegfx::B2DPolygon const&, unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned short, double*, double*)
basegfx::tools::findCut(basegfx::B2DPolygon const&, unsigned int, unsigned int, unsigned short, double*, double*)
-basegfx::tools::getArea(basegfx::B3DPolygon const&)
-basegfx::tools::getCutBetweenLineAndPolygon(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, basegfx::B3DPoint const&, double&)
-basegfx::tools::getIndexOfPredecessor(unsigned int, basegfx::B3DPolygon const&)
-basegfx::tools::getPositionRelative(basegfx::B3DPolygon const&, double, double)
-basegfx::tools::getPositiveOrientedNormal(basegfx::B3DPolygon const&)
-basegfx::tools::isInEpsilonRange(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, double)
-basegfx::tools::isInside(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&, bool)
+basegfx::tools::getOrientation(basegfx::B3DPolygon const&)
+basegfx::tools::getPositionAbsolute(basegfx::B3DPolygon const&, double, double)
+basegfx::tools::getRangeWithControlPoints(basegfx::B2DPolygon const&)
+basegfx::tools::isInEpsilonRange(basegfx::B3DPoint const&, basegfx::B3DPoint const&, basegfx::B3DPoint const&, double)
basegfx::tools::isPolyPolygonEqualRectangle(basegfx::B2DPolyPolygon const&, basegfx::B2DRange const&)
basegfx::tools::liangBarskyClip2D(basegfx::B2DPoint&, basegfx::B2DPoint&, basegfx::B2DRange const&)
+basegfx::tools::reSegmentPolygonEdges(basegfx::B2DPolygon const&, unsigned int, bool, bool)
basegfx::tools::rotateAroundPoint(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, double)
basegfx::tools::setContinuity(basegfx::B2DPolyPolygon const&, basegfx::B2VectorContinuity)
basegfx::tools::solveCrossovers(basegfx::B2DPolygon const&)
@@ -1090,6 +1089,9 @@ connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*, connectiv
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
connectivity::toString(com::sun::star::uno::Any const&)
+cppcanvas::internal::(anonymous namespace)::TransparencyGroupAction::TransparencyGroupAction(std::auto_ptr<GDIMetaFile>&, cppcanvas::Renderer::Parameters const&, basegfx::B2DPoint const&, basegfx::B2DVector const&, double, boost::shared_ptr<cppcanvas::Canvas> const&, cppcanvas::internal::OutDevState const&)
+cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XAnimatedSprite> const&, boost::shared_ptr<cppcanvas::internal::ImplSpriteCanvas::TransformationArbiter> const&)
+cppcanvas::internal::ImplText::ImplText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&)
dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, int)
dbtools::CharsetIteratorDerefHelper::CharsetIteratorDerefHelper()
@@ -1105,6 +1107,7 @@ drawinglayer::attribute::SdrFillTextAttribute::isDefault() const
drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
+drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D(basegfx::B2DPolyPolygon const&, drawinglayer::attribute::LineAttribute const&)
formula::ArgInput::GetArgSelection()
formula::EditBox::EditBox(Window*, long)
formula::FormulaListBox::FormulaListBox(Window*, long)
@@ -1268,6 +1271,7 @@ sd::slidesorter::model::VisualState::SetVisualStateBlend(double)
sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double)
sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double)
sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const
+sd::slidesorter::view::Button::IsDown() const
sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
sdext::presenter::PresenterAnimation::AddEndCallback(boost::function<void ()> const&)
sdext::presenter::PresenterAnimation::PresenterAnimation(unsigned long, unsigned long, unsigned long)
commit 1a302e716a9e6b8a8cc2cae2777cfe227ff2b95c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 18 22:50:04 2012 +0000
risk converting ByteString to rtl::OString for OSes I don't have
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index dbff33c..adae096 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -316,46 +316,46 @@ void InitSalMain()
oslFileError err2 = osl_getSystemPathFromFileURL(urlWorkDir.pData, &sysWorkDir);
if (err2 == osl_File_E_None)
{
- ByteString aPath( getenv( "PATH" ) );
- ByteString aResPath( getenv( "STAR_RESOURCEPATH" ) );
- ByteString aLibPath( getenv( "DYLD_LIBRARY_PATH" ) );
- ByteString aCmdPath( OUStringToOString(OUString(sysWorkDir), RTL_TEXTENCODING_UTF8).getStr() );
- ByteString aTmpPath;
+ rtl::OString aPath( getenv( "PATH" ) );
+ rtl::OString aResPath( getenv( "STAR_RESOURCEPATH" ) );
+ rtl::OString aLibPath( getenv( "DYLD_LIBRARY_PATH" ) );
+ rtl::OString aCmdPath( OUStringToOString(OUString(sysWorkDir), RTL_TEXTENCODING_UTF8).getStr() );
+ rtl::OString aTmpPath;
// Get absolute path of command's directory
- if ( aCmdPath.Len() ) {
+ if ( !aCmdPath.isEmpty() ) {
DirEntry aCmdDirEntry( aCmdPath );
aCmdDirEntry.ToAbs();
aCmdPath = rtl::OUStringToOString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
}
// Assign to PATH environment variable
- if ( aCmdPath.Len() )
+ if ( !aCmdPath.isEmpty() )
{
- aTmpPath = ByteString( "PATH=" );
+ aTmpPath = rtl::OString( "PATH=" );
aTmpPath += aCmdPath;
- if ( aPath.Len() )
+ if ( !aPath.isEmpty() )
aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aPath;
- putenv( (char*)aTmpPath.GetBuffer() );
+ putenv( (char*)aTmpPath.getStr() );
}
// Assign to STAR_RESOURCEPATH environment variable
- if ( aCmdPath.Len() )
+ if ( !aCmdPath.isEmpty() )
{
- aTmpPath = ByteString( "STAR_RESOURCEPATH=" );
+ aTmpPath = rtl::OString( "STAR_RESOURCEPATH=" );
aTmpPath += aCmdPath;
- if ( aResPath.Len() )
+ if ( !aResPath.isEmpty() )
aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aResPath;
- putenv( (char*)aTmpPath.GetBuffer() );
+ putenv( (char*)aTmpPath.getStr() );
}
// Assign to DYLD_LIBRARY_PATH environment variable
- if ( aCmdPath.Len() )
+ if ( !aCmdPath.isEmpty() )
{
- aTmpPath = ByteString( "DYLD_LIBRARY_PATH=" );
+ aTmpPath = rtl::OString( "DYLD_LIBRARY_PATH=" );
aTmpPath += aCmdPath;
- if ( aLibPath.Len() )
+ if ( !aLibPath.isEmpty() )
aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aLibPath;
- putenv( (char*)aTmpPath.GetBuffer() );
+ putenv( (char*)aTmpPath.getStr() );
}
}
}
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index a41d40d..f51346f 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -239,9 +239,9 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
ByteCount nDummy;
ATSUGetAttribute( mrATSUStyle, kATSUSizeTag, sizeof(fFontSize), &fFontSize, &nDummy);
String aUniName( &rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount );
- ByteString aCName( aUniName, RTL_TEXTENCODING_UTF8 );
+ rtl::OString aCName(rtl::OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8));
fprintf( stderr, "ATSLayout( \"%s\" %d..%d of %d) with h=%4.1f\n",
- aCName.GetBuffer(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize) );
+ aCName.getStr(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize) );
#endif
// create the ATSUI layout
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index 5ca2e5e..1a52f10 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -53,17 +53,16 @@
// and SFNT fonts on Mac usually do not contain an OS/2 table.
static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& rDFA )
{
- ByteString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ) );
- aPSName.ToLowerAscii();
+ rtl::OString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
// TODO: use a multi-string ignore-case matcher once it becomes available
- if( (aPSName.Search("regular") != STRING_NOTFOUND)
- || (aPSName.Search("normal") != STRING_NOTFOUND)
- || (aPSName.Search("roman") != STRING_NOTFOUND)
- || (aPSName.Search("medium") != STRING_NOTFOUND)
- || (aPSName.Search("plain") != STRING_NOTFOUND)
- || (aPSName.Search("standard") != STRING_NOTFOUND)
- || (aPSName.Search("std") != STRING_NOTFOUND) )
+ if( (aPSName.indexOf("regular") != -1)
+ || (aPSName.indexOf("normal") != -1)
+ || (aPSName.indexOf("roman") != -1)
+ || (aPSName.indexOf("medium") != -1)
+ || (aPSName.indexOf("plain") != -1)
+ || (aPSName.indexOf("standard") != -1)
+ || (aPSName.indexOf("std") != -1) )
{
rDFA.meWidthType = WIDTH_NORMAL;
rDFA.meWeight = WEIGHT_NORMAL;
@@ -71,108 +70,108 @@ static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttrib
}
// heuristics for font weight
- if (aPSName.Search("extrablack") != STRING_NOTFOUND)
+ if (aPSName.indexOf("extrablack") != -1)
rDFA.meWeight = WEIGHT_BLACK;
- else if (aPSName.Search("black") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("black") != -1)
rDFA.meWeight = WEIGHT_BLACK;
- //else if (aPSName.Search("book") != STRING_NOTFOUND)
+ //else if (aPSName.indexOf("book") != -1)
// rDFA.meWeight = WEIGHT_SEMIBOLD;
- else if( (aPSName.Search("semibold") != STRING_NOTFOUND)
- || (aPSName.Search("smbd") != STRING_NOTFOUND))
+ else if( (aPSName.indexOf("semibold") != -1)
+ || (aPSName.indexOf("smbd") != -1))
rDFA.meWeight = WEIGHT_SEMIBOLD;
- else if (aPSName.Search("ultrabold") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("ultrabold") != -1)
rDFA.meWeight = WEIGHT_ULTRABOLD;
- else if (aPSName.Search("extrabold") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("extrabold") != -1)
rDFA.meWeight = WEIGHT_BLACK;
- else if( (aPSName.Search("bold") != STRING_NOTFOUND)
- || (aPSName.Search("-bd") != STRING_NOTFOUND))
+ else if( (aPSName.indexOf("bold") != -1)
+ || (aPSName.indexOf("-bd") != -1))
rDFA.meWeight = WEIGHT_BOLD;
- else if (aPSName.Search("extralight") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("extralight") != -1)
rDFA.meWeight = WEIGHT_ULTRALIGHT;
- else if (aPSName.Search("ultralight") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("ultralight") != -1)
rDFA.meWeight = WEIGHT_ULTRALIGHT;
- else if (aPSName.Search("light") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("light") != -1)
rDFA.meWeight = WEIGHT_LIGHT;
- else if (aPSName.Search("thin") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("thin") != -1)
rDFA.meWeight = WEIGHT_THIN;
- else if (aPSName.Search("-w3") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w3") != -1)
rDFA.meWeight = WEIGHT_LIGHT;
- else if (aPSName.Search("-w4") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w4") != -1)
rDFA.meWeight = WEIGHT_SEMILIGHT;
- else if (aPSName.Search("-w5") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w5") != -1)
rDFA.meWeight = WEIGHT_NORMAL;
- else if (aPSName.Search("-w6") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w6") != -1)
rDFA.meWeight = WEIGHT_SEMIBOLD;
- else if (aPSName.Search("-w7") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w7") != -1)
rDFA.meWeight = WEIGHT_BOLD;
- else if (aPSName.Search("-w8") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w8") != -1)
rDFA.meWeight = WEIGHT_ULTRABOLD;
- else if (aPSName.Search("-w9") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("-w9") != -1)
rDFA.meWeight = WEIGHT_BLACK;
// heuristics for font slant
- if( (aPSName.Search("italic") != STRING_NOTFOUND)
- || (aPSName.Search(" ital") != STRING_NOTFOUND)
- || (aPSName.Search("cursive") != STRING_NOTFOUND)
- || (aPSName.Search("-it") != STRING_NOTFOUND)
- || (aPSName.Search("lightit") != STRING_NOTFOUND)
- || (aPSName.Search("mediumit") != STRING_NOTFOUND)
- || (aPSName.Search("boldit") != STRING_NOTFOUND)
- || (aPSName.Search("cnit") != STRING_NOTFOUND)
- || (aPSName.Search("bdcn") != STRING_NOTFOUND)
- || (aPSName.Search("bdit") != STRING_NOTFOUND)
- || (aPSName.Search("condit") != STRING_NOTFOUND)
- || (aPSName.Search("bookit") != STRING_NOTFOUND)
- || (aPSName.Search("blackit") != STRING_NOTFOUND) )
+ if( (aPSName.indexOf("italic") != -1)
+ || (aPSName.indexOf(" ital") != -1)
+ || (aPSName.indexOf("cursive") != -1)
+ || (aPSName.indexOf("-it") != -1)
+ || (aPSName.indexOf("lightit") != -1)
+ || (aPSName.indexOf("mediumit") != -1)
+ || (aPSName.indexOf("boldit") != -1)
+ || (aPSName.indexOf("cnit") != -1)
+ || (aPSName.indexOf("bdcn") != -1)
+ || (aPSName.indexOf("bdit") != -1)
+ || (aPSName.indexOf("condit") != -1)
+ || (aPSName.indexOf("bookit") != -1)
+ || (aPSName.indexOf("blackit") != -1) )
rDFA.meItalic = ITALIC_NORMAL;
- if( (aPSName.Search("oblique") != STRING_NOTFOUND)
- || (aPSName.Search("inclined") != STRING_NOTFOUND)
- || (aPSName.Search("slanted") != STRING_NOTFOUND) )
+ if( (aPSName.indexOf("oblique") != -1)
+ || (aPSName.indexOf("inclined") != -1)
+ || (aPSName.indexOf("slanted") != -1) )
rDFA.meItalic = ITALIC_OBLIQUE;
// heuristics for font width
- if( (aPSName.Search("condensed") != STRING_NOTFOUND)
- || (aPSName.Search("-cond") != STRING_NOTFOUND)
- || (aPSName.Search("boldcond") != STRING_NOTFOUND)
- || (aPSName.Search("boldcn") != STRING_NOTFOUND)
- || (aPSName.Search("cnit") != STRING_NOTFOUND) )
+ if( (aPSName.indexOf("condensed") != -1)
+ || (aPSName.indexOf("-cond") != -1)
+ || (aPSName.indexOf("boldcond") != -1)
+ || (aPSName.indexOf("boldcn") != -1)
+ || (aPSName.indexOf("cnit") != -1) )
rDFA.meWidthType = WIDTH_CONDENSED;
- else if (aPSName.Search("narrow") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("narrow") != -1)
rDFA.meWidthType = WIDTH_SEMI_CONDENSED;
- else if (aPSName.Search("expanded") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("expanded") != -1)
rDFA.meWidthType = WIDTH_EXPANDED;
- else if (aPSName.Search("wide") != STRING_NOTFOUND)
+ else if (aPSName.indexOf("wide") != -1)
rDFA.meWidthType = WIDTH_EXPANDED;
// heuristics for font pitch
- if( (aPSName.Search("mono") != STRING_NOTFOUND)
- || (aPSName.Search("courier") != STRING_NOTFOUND)
- || (aPSName.Search("monaco") != STRING_NOTFOUND)
- || (aPSName.Search("typewriter") != STRING_NOTFOUND) )
+ if( (aPSName.indexOf("mono") != -1)
+ || (aPSName.indexOf("courier") != -1)
+ || (aPSName.indexOf("monaco") != -1)
+ || (aPSName.indexOf("typewriter") != -1) )
rDFA.mePitch = PITCH_FIXED;
// heuristics for font family type
- if( (aPSName.Search("script") != STRING_NOTFOUND)
- || (aPSName.Search("chancery") != STRING_NOTFOUND)
- || (aPSName.Search("zapfino") != STRING_NOTFOUND))
+ if( (aPSName.indexOf("script") != -1)
+ || (aPSName.indexOf("chancery") != -1)
+ || (aPSName.indexOf("zapfino") != -1))
rDFA.meFamily = FAMILY_SCRIPT;
- else if( (aPSName.Search("comic") != STRING_NOTFOUND)
- || (aPSName.Search("outline") != STRING_NOTFOUND)
- || (aPSName.Search("pinpoint") != STRING_NOTFOUND) )
+ else if( (aPSName.indexOf("comic") != -1)
+ || (aPSName.indexOf("outline") != -1)
+ || (aPSName.indexOf("pinpoint") != -1) )
rDFA.meFamily = FAMILY_DECORATIVE;
- else if( (aPSName.Search("sans") != STRING_NOTFOUND)
- || (aPSName.Search("arial") != STRING_NOTFOUND) )
+ else if( (aPSName.indexOf("sans") != -1)
+ || (aPSName.indexOf("arial") != -1) )
rDFA.meFamily = FAMILY_SWISS;
- else if( (aPSName.Search("roman") != STRING_NOTFOUND)
- || (aPSName.Search("times") != STRING_NOTFOUND) )
+ else if( (aPSName.indexOf("roman") != -1)
+ || (aPSName.indexOf("times") != -1) )
rDFA.meFamily = FAMILY_ROMAN;
// heuristics for codepoint semantic
- if( (aPSName.Search("symbol") != STRING_NOTFOUND)
- || (aPSName.Search("dings") != STRING_NOTFOUND)
- || (aPSName.Search("dingbats") != STRING_NOTFOUND)
- || (aPSName.Search("ornaments") != STRING_NOTFOUND)
- || (aPSName.Search("embellishments") != STRING_NOTFOUND) )
+ if( (aPSName.indexOf("symbol") != -1)
+ || (aPSName.indexOf("dings") != -1)
+ || (aPSName.indexOf("dingbats") != -1)
+ || (aPSName.indexOf("ornaments") != -1)
+ || (aPSName.indexOf("embellishments") != -1) )
rDFA.mbSymbolFlag = true;
// #i100020# special heuristic for names with single-char styles
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 34b1091..0fccd6d 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -2222,7 +2222,7 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) )
return sal_False;
const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding();
- const ByteString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) );
+ const rtl::OString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) );
// get the raw-bytes from the font to be subset
ByteVector aBuffer;
@@ -2240,7 +2240,7 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
// NOTE: assuming that all glyphids requested on Aqua are fully translated
// make the subsetter provide the requested subset
- FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" );
+ FILE* pOutFile = fopen( aToFile.getStr(), "wb" );
bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL,
pGlyphIDs, pEncoding, nGlyphCount, pGlyphWidths );
fclose( pOutFile );
@@ -2338,7 +2338,7 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
free( pGlyphMetrics );
// write subset into destination file
- nRC = ::CreateTTFromTTGlyphs( pSftFont, aToFile.GetBuffer(), aShortIDs,
+ nRC = ::CreateTTFromTTGlyphs( pSftFont, aToFile.getStr(), aShortIDs,
aTempEncs, nGlyphCount, 0, NULL, 0 );
::CloseTTFont(pSftFont);
return (nRC == SF_OK);
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index b47c168..9e4c8c6 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -189,35 +189,36 @@ void InitSalMain()
oslFileError err2 = osl_getSystemPathFromFileURL(urlWorkDir.pData, &sysWorkDir);
if (err2 == osl_File_E_None)
{
- ByteString aPath( getenv( "PATH" ) );
- ByteString aResPath( getenv( "STAR_RESOURCEPATH" ) );
- ByteString aCmdPath( OUStringToOString(OUString(sysWorkDir), RTL_TEXTENCODING_UTF8).getStr() );
- ByteString aTmpPath;
+ rtl::OString aPath( getenv( "PATH" ) );
+ rtl::OString aResPath( getenv( "STAR_RESOURCEPATH" ) );
+ rtl::OString aCmdPath( OUStringToOString(OUString(sysWorkDir), RTL_TEXTENCODING_UTF8).getStr() );
+ rtl::OString aTmpPath;
// Get absolute path of command's directory
- if ( aCmdPath.Len() ) {
+ if ( !aCmdPath.isEmpty() )
+ {
DirEntry aCmdDirEntry( aCmdPath );
aCmdDirEntry.ToAbs();
aCmdPath = rtl::OUStringToOString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
}
// Assign to PATH environment variable
- if ( aCmdPath.Len() )
+ if ( !aCmdPath.isEmpty() )
{
- aTmpPath = ByteString( "PATH=" );
+ aTmpPath = rtl::OString( "PATH=" );
aTmpPath += aCmdPath;
- if ( aPath.Len() )
+ if ( !aPath.isEmpty() )
aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aPath;
- putenv( (char*)aTmpPath.GetBuffer() );
+ putenv( (char*)aTmpPath.getStr() );
}
// Assign to STAR_RESOURCEPATH environment variable
- if ( aCmdPath.Len() )
+ if ( !aCmdPath.isEmpty() )
{
- aTmpPath = ByteString( "STAR_RESOURCEPATH=" );
+ aTmpPath = rtl::OString( "STAR_RESOURCEPATH=" );
aTmpPath += aCmdPath;
- if ( aResPath.Len() )
+ if ( !aResPath.isEmpty() )
aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aResPath;
- putenv( (char*)aTmpPath.GetBuffer() );
+ putenv( (char*)aTmpPath.getStr() );
}
}
}
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index 7f9e5b4..e9a16ef 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -1940,7 +1940,7 @@ sal_Bool IosSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) )
return sal_False;
const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding();
- const ByteString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) );
+ const rtl::OString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) );
// get the raw-bytes from the font to be subset
ByteVector aBuffer;
@@ -1958,7 +1958,7 @@ sal_Bool IosSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
// NOTE: assuming that all glyphids requested on Ios are fully translated
// make the subsetter provide the requested subset
- FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" );
+ FILE* pOutFile = fopen( aToFile.getStr(), "wb" );
bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL,
pGlyphIDs, pEncoding, nGlyphCount, pGlyphWidths );
fclose( pOutFile );
@@ -2056,7 +2056,7 @@ sal_Bool IosSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
free( pGlyphMetrics );
// write subset into destination file
- nRC = ::CreateTTFromTTGlyphs( pSftFont, aToFile.GetBuffer(), aShortIDs,
+ nRC = ::CreateTTFromTTGlyphs( pSftFont, aToFile.getStr(), aShortIDs,
aTempEncs, nGlyphCount, 0, NULL, 0 );
::CloseTTFont(pSftFont);
return (nRC == SF_OK);
commit c251139ca22e10f21cf5e4f23df2a1d10fc3925f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 18 22:29:10 2012 +0000
ByteString->rtl::OString
diff --git a/tools/bootstrp/mkunroll/mkunroll.cxx b/tools/bootstrp/mkunroll/mkunroll.cxx
index d315af5..9068ee2 100644
--- a/tools/bootstrp/mkunroll/mkunroll.cxx
+++ b/tools/bootstrp/mkunroll/mkunroll.cxx
@@ -210,9 +210,8 @@ void MkFilter::Filter()
for ( size_t i=0; i<nCount; i++ )
{
MkLine *pMkLine = (*pLine->pPrivateTnrLst)[ i ];
- ByteString aLine = pMkLine->aLine;
- while( aLine.SearchAndReplace( aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n)) ) != (sal_uInt16)-1 ) ;
- fputs( aLine.GetBuffer(), pOut );
+ rtl::OString aLine = pMkLine->aLine.replaceAll(aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n)));
+ fputs( aLine.getStr(), pOut );
fprintf( stderr, "o" );
}
}
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 007dc81..1e3f408 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -75,9 +75,9 @@ struct mnttab
struct mymnttab
{
dev_t mountdevice;
- ByteString mountspecial;
- ByteString mountpoint;
- ByteString mymnttab_filesystem;
+ rtl::OString mountspecial;
+ rtl::OString mountpoint;
+ rtl::OString mymnttab_filesystem;
mymnttab() { mountdevice = (dev_t) -1; }
};
commit 25ee58aeafc85412a727d6d816e914e5fa83ac17
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 18 22:24:54 2012 +0000
addexes dir seems useless
diff --git a/tools/bootstrp/addexes/replace.cxx b/tools/bootstrp/addexes/replace.cxx
deleted file mode 100644
index b9c59d5..0000000
--- a/tools/bootstrp/addexes/replace.cxx
+++ /dev/null
@@ -1,77 +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 <stdio.h>
-#include <tools/string.hxx>
-
-
-/****************************************************************************/
-#if defined UNX
-int main( int argc, char *argv[] )
-#else
-int _cdecl main( int argc, char *argv[] )
-#endif
-/****************************************************************************/
-{
- if ( argc < 4 )
- {
- fprintf( stderr, "ERROR: too few parameters. \n\n");
- fprintf( stderr, "usage: txtrep.exe EnvironmentVariable Searchstring replacestring\n");
- return 1;
- }
- ByteString aText( getenv( argv[ 1 ] ));
- if ( aText.Len() == 0 )
- {
- fprintf( stderr, "ERROR: Variable not set. \n\n");
- fprintf( stderr, "usage: txtrep.exe EnvironmentVariable Searchstring replacestring\n");
- return 2;
- }
- ByteString aSearch( argv[ 2 ] );
- ByteString aReplace( argv[ 3 ] );
-
- ByteString aUpperText( aText );
- aUpperText.ToUpperAscii();
-
-
- sal_uIntPtr nIndex;
- aSearch.ToUpperAscii();
-
- nIndex = aUpperText.Search( aSearch.GetBuffer(), 0);
- while ( nIndex != STRING_NOTFOUND )
- {
- aText.Replace( nIndex, aSearch.Len(), aReplace.GetBuffer());
- aUpperText.Replace( nIndex, aSearch.Len(), aReplace.GetBuffer());
- nIndex = aUpperText.Search( aSearch.GetBuffer(), nIndex + aReplace.Len());
- }
-
- fprintf( stdout, "%s\n", aText.GetBuffer());
- return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a0abab41cad2b17c1e114657ef721c419933886e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 18 21:02:55 2012 +0000
entirely unused UnoMemoryStream class
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 8dabc0d..efce186 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -124,7 +124,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/helper/registerservices \
toolkit/source/helper/servicenames \
toolkit/source/helper/tkresmgr \
- toolkit/source/helper/unomemorystream \
toolkit/source/helper/unopropertyarrayhelper \
toolkit/source/helper/unowrapper \
toolkit/source/helper/vclunohelper \
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index 64993f8..0e60190 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unomemorystream.hxx,toolkit/helper/unomemorystream.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
diff --git a/toolkit/inc/toolkit/helper/unomemorystream.hxx b/toolkit/inc/toolkit/helper/unomemorystream.hxx
deleted file mode 100644
index 7cfeae0..0000000
--- a/toolkit/inc/toolkit/helper/unomemorystream.hxx
+++ /dev/null
@@ -1,75 +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 _TOOLKIT_HELPER_UNOMEMORYSTREAM_HXX_
-#define _TOOLKIT_HELPER_UNOMEMORYSTREAM_HXX_
-
-
-#include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
-
-#include <tools/stream.hxx>
-
-// ----------------------------------------------------
-// class UNOMEMORYSTREAM
-// ----------------------------------------------------
-
-class UnoMemoryStream : public SvMemoryStream,
- public ::com::sun::star::io::XInputStream,
- public ::cppu::OWeakObject
-{
-private:
- ::osl::Mutex maMutex;
-
-protected:
- ::osl::Mutex& GetMutex() { return maMutex; }
-
-
-public:
- UnoMemoryStream( sal_uInt32 nInitSize = 0x3FFF, sal_uInt32 nResize = 0x3FFFF );
-
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
- void SAL_CALL release() throw() { OWeakObject::release(); }
-
- // ::com::sun::star::io::XInputStream
- sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- void SAL_CALL closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-};
-
-
-
-
-#endif // _TOOLKIT_HELPER_UNOMEMORYSTREAM_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 4dc6628..2e87784 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -44,7 +44,6 @@
#include <toolkit/controls/stdtabcontroller.hxx>
#include <toolkit/helper/property.hxx>
#include <toolkit/helper/unopropertyarrayhelper.hxx>
-#include <toolkit/helper/unomemorystream.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <toolkit/helper/macros.hxx>
#include <toolkit/helper/imagealign.hxx>
diff --git a/toolkit/source/helper/unomemorystream.cxx b/toolkit/source/helper/unomemorystream.cxx
deleted file mode 100644
index 97cb8d2..0000000
--- a/toolkit/source/helper/unomemorystream.cxx
+++ /dev/null
@@ -1,108 +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 <toolkit/helper/unomemorystream.hxx>
-#include <algorithm>
-
-// ----------------------------------------------------
-// class UnoMemoryStream
-// ----------------------------------------------------
-UnoMemoryStream::UnoMemoryStream( sal_uInt32 nInitSize, sal_uInt32 nInitResize )
- : SvMemoryStream( nInitSize, nInitResize )
-{
-}
-
-// ::com::sun::star::uno::XInterface
-::com::sun::star::uno::Any UnoMemoryStream::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
-{
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
- SAL_STATIC_CAST( ::com::sun::star::io::XInputStream*, this ) );
- return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
-
-// ::com::sun::star::io::XInputStream
-sal_Int32 UnoMemoryStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
-{
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- sal_Int32 nRead = available();
- if ( nRead > nBytesToRead )
- nRead = nBytesToRead;
-
- rData = ::com::sun::star::uno::Sequence< sal_Int8 >( nRead );
- Read( rData.getArray(), nRead );
-
- return nRead;
-}
-
-sal_Int32 UnoMemoryStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
-{
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- sal_Int32 nAvailable = available();
- if( nAvailable )
- {
- return readBytes( rData, std::min( nMaxBytesToRead , nAvailable ) );
- }
- else
- {
- // Not the most effective method, but it sticks to the specification
- return readBytes( rData, 1 );
- }
-}
-
-void UnoMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
-{
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- SeekRel( nBytesToSkip );
-}
-
-sal_Int32 UnoMemoryStream::available() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
-{
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- sal_uInt32 nStreamPos = Tell();
- sal_uInt32 nEnd = Seek( STREAM_SEEK_TO_END );
- Seek( nStreamPos );
- return nEnd - nStreamPos;
-}
-
-void UnoMemoryStream::closeInput() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
-{
- // nothing to do
-}
-
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a32050b3187ca4d0539dda860a7016905f9b7a34
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 18 20:41:30 2012 +0000
give copy ctor a conventional signature
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index db96148..e5b87ed 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1285,9 +1285,9 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim
ImplCalculateTextPositions();
}
-TextObj::TextObj( TextObj& rTextObj )
+TextObj::TextObj( const TextObj& rTextObj )
{
- mpImplTextObj = rTextObj.mpImplTextObj;
+ mpImplTextObj = const_cast<TextObj&>(rTextObj).mpImplTextObj;
mpImplTextObj->mnRefCount++;
}
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 3d0d0f2..58ddca9 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -249,7 +249,7 @@ class TextObj
public :
TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > &
rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv );
- TextObj( TextObj& rTextObj );
+ TextObj( const TextObj& rTextObj );
~TextObj();
void Write( SvStream* pStrm );
commit af9709c3cba8c386a30553c43a620320b15c65f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 18 20:24:08 2012 +0000
remove adabas/adabasui
diff --git a/Repository.mk b/Repository.mk
index 5584744..71697e1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -152,8 +152,6 @@ endif
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
PptImporter \
abp \
- adabas \
- adabasui \
acc \
agg \
analysis \
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc
deleted file mode 100755
index a5911dc..0000000
--- a/connectivity/source/inc/resource/adabas_res.hrc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************
- *
- * 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 CONNECTIVITY_RESOURCE_ADABAS_HRC
-#define CONNECTIVITY_RESOURCE_ADABAS_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// ============================================================================
-// = the Adabas D driver's resource strings
-// ============================================================================
-#define STR_NO_DISK_SPACE ( STR_ADABAS_BASE + 1 )
-#define STR_COMMAND_NOT_FOUND ( STR_ADABAS_BASE + 2 )
-#define STR_DATABASE_NEEDS_CONVERTING ( STR_ADABAS_BASE + 3 )
-#define STR_USER_NO_DELETE ( STR_ADABAS_BASE + 9 )
-
-#endif // CONNECTIVITY_RESOURCE_ADABAS_HRC
-
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 981f5a8..e11ca7a 100755
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
@@ -58,9 +58,6 @@
// MACAB driver resource ids
#define STR_MACAB_BASE 1650
-// Adabas D driver resource ids
-#define STR_ADABAS_BASE 1700
-
// hsqldb driver resource ids
#define STR_HSQLDB_BASE 1750
// ============================================================================
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 1c1d703..18edb16 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -33,7 +33,6 @@
#include "resource/file_res.hrc"
#include "resource/evoab2_res.hrc"
#include "resource/kab_res.hrc"
-#include "resource/adabas_res.hrc"
#include "resource/hsqldb_res.hrc"
// ============================================================================
@@ -599,24 +598,6 @@ String STR_NO_MAC_OS_FOUND
Text [ en-US ] = "No suitable Mac OS installation was found.";
};
-// ADABAS D
-String STR_NO_DISK_SPACE
-{
- Text [ en-US ] = "The database file '$filename$' could not be created. Please check your disk space.";
-};
-
-String STR_COMMAND_NOT_FOUND
-{
- Text [ en-US ] = "The database '$databasename$' could not be started because the command '$progname$' could not be executed.";
-};
-String STR_DATABASE_NEEDS_CONVERTING
-{
- Text [ en-US ] = "The current database need to be converted. Please insert control user and password.";
-};
-String STR_USER_NO_DELETE
-{
- Text [ en-US ] = "This user couldn't be deleted. Otherwise the database stays in a inconsistent state.";
-};
// hsqldb
String STR_NO_STROAGE
{
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
deleted file mode 100644
index f0a8dde..0000000
--- a/dbaccess/AllLangResTarget_adabasui.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,adabasui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,adabasui,\
- dbaccess/adabasui \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/dbaccess/inc) \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\
- dbaccess/source/ext/adabas/AdabasNewDb.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 177bfa3..f0957ea 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/control/TableGrantCtrl.src \
dbaccess/source/ui/control/tabletree.src \
dbaccess/source/ui/control/undosqledit.src \
- dbaccess/source/ui/dlg/AdabasStat.src \
dbaccess/source/ui/dlg/admincontrols.src \
dbaccess/source/ui/dlg/adtabdlg.src \
dbaccess/source/ui/dlg/advancedsettings.src \
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index bb67ab0..d461902 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbui,\
dbaccess/source/ui/control/TableGrantCtrl.src \
dbaccess/source/ui/control/tabletree.src \
dbaccess/source/ui/control/undosqledit.src \
- dbaccess/source/ui/dlg/AdabasStat.src \
dbaccess/source/ui/dlg/admincontrols.src \
dbaccess/source/ui/dlg/adtabdlg.src \
dbaccess/source/ui/dlg/advancedsettings.src \
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
deleted file mode 100644
index de00e77..0000000
--- a/dbaccess/Library_adabasui.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,adabasui))
-
-$(eval $(call gb_Library_set_include,adabasui,\
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_add_defs,adabasui,\
- -DCOMPMOD_NAMESPACE=adabasui \
-))
-
-$(eval $(call gb_Library_add_api,adabasui,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_add_linked_libs,adabasui,\
- comphelper \
- cppu \
- cppuhelper \
- dbtools \
- sal \
- sfx \
- svl \
- svt \
- tk \
- tl \
- ucbhelper \
- utl \
- vcl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_set_componentfile,adabasui,dbaccess/source/ext/adabas/adabasui))
-
-$(eval $(call gb_Library_add_exception_objects,adabasui,\
- dbaccess/source/ext/adabas/Acomponentmodule \
- dbaccess/source/ext/adabas/AdabasNewDb \
- dbaccess/source/ext/adabas/adabasuistrings \
- dbaccess/source/ext/adabas/ANewDb \
- dbaccess/source/ext/adabas/Aservices \
- dbaccess/source/ext/adabas/ASqlNameEdit \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 9097874..e096c2d 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -130,7 +130,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/control/toolboxcontroller \
dbaccess/source/ui/control/undosqledit \
dbaccess/source/ui/control/VertSplitView \
- dbaccess/source/ui/dlg/AdabasStat \
dbaccess/source/ui/dlg/admincontrols \
dbaccess/source/ui/dlg/adminpages \
dbaccess/source/ui/dlg/adtabdlg \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index f17a8b7..84fe364 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -157,7 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/dlg/DBSetupConnectionPages \
dbaccess/source/ui/dlg/UserAdminDlg \
dbaccess/source/ui/dlg/UserAdmin \
- dbaccess/source/ui/dlg/AdabasStat \
dbaccess/source/ui/dlg/tablespage \
dbaccess/source/ui/dlg/DbAdminImpl \
dbaccess/source/ui/dlg/TablesSingleDlg \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index bb37eb5..810453b 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -48,7 +48,6 @@
#define HID_DSADMIN_PAGE_DBASE "DBACCESS_HID_DSADMIN_PAGE_DBASE"
#define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC"
#define HID_DSADMIN_PAGE_ODBC "DBACCESS_HID_DSADMIN_PAGE_ODBC"
-#define HID_DSADMIN_PAGE_ADABAS "DBACCESS_HID_DSADMIN_PAGE_ADABAS"
#define HID_DSADMIN_PAGE_TEXT "DBACCESS_HID_DSADMIN_PAGE_TEXT"
#define HID_DSADMIN_TABLE_SUBSCRIPTION "DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION"
#define HID_DSADMIN_DSACTIONS_NEWDS "DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS"
@@ -284,7 +283,6 @@
#define HID_DSADMIN_MYSQL_DATABASE "DBACCESS_HID_DSADMIN_MYSQL_DATABASE"
#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"
#define HID_DSADMIN_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"
-#define HID_DSADMIN_ADABAS_DATABASE "DBACCESS_HID_DSADMIN_ADABAS_DATABASE"
#define HID_DSADMIN_MSACCESS_MDB_FILE "DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"
#define HID_DSADMIN_PAGE_MSACCESS "DBACCESS_HID_DSADMIN_PAGE_MSACCESS"
#define HID_DSADMIN_FLAT_PATH "DBACCESS_HID_DSADMIN_FLAT_PATH"
@@ -330,7 +328,6 @@
#define HID_DSADMIN_TYPE_DIALOG "DBACCESS_HID_DSADMIN_TYPE_DIALOG"
#define HID_DSADMIN_ENABLEOUTERJOIN "DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN"
-#define HID_DSADMIN_ADABASADMIN "DBACCESS_HID_DSADMIN_ADABASADMIN"
#define HID_DSADMIN_USERADMIN "DBACCESS_HID_DSADMIN_USERADMIN"
#define HID_DBWIZ_PREVIOUS "DBACCESS_HID_DBWIZ_PREVIOUS"
@@ -380,9 +377,6 @@
#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL "DBACCESS_HID_PAGE_DBWIZARD_LDAP_CB_USESSL"
#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION"
-#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME "DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME"
-#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME "DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME"
-
#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC"
#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC"
@@ -439,28 +433,6 @@
#define HID_DSADMIN_RESPECTRESULTSETTYPE "DBACCESS_HID_DSADMIN_RESPECTRESULTSETTYPE"
// this one below have hid in number space HID_SBA_START
-#define HID_DLG_ADABAS_NEWDB "DBACCESS_HID_DLG_ADABAS_NEWDB"
-#define HID_DLG_ADABAS_DBNAME "DBACCESS_HID_DLG_ADABAS_DBNAME"
-#define HID_DLG_ADABAS_SYSUSR "DBACCESS_HID_DLG_ADABAS_SYSUSR"
-#define HID_DLG_ADABAS_SYSPWD "DBACCESS_HID_DLG_ADABAS_SYSPWD"
-#define HID_DLG_ADABAS_CONUSR "DBACCESS_HID_DLG_ADABAS_CONUSR"
-#define HID_DLG_ADABAS_CONPWD "DBACCESS_HID_DLG_ADABAS_CONPWD"
-#define HID_DLG_ADABAS_DATADEVSPACE_SIZE "DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE"
-#define HID_DLG_ADABAS_CACHE_SIZE "DBACCESS_HID_DLG_ADABAS_CACHE_SIZE"
-#define HID_DLG_ADABAS_USR "DBACCESS_HID_DLG_ADABAS_USR"
-#define HID_DLG_ADABAS_DOMAINPWD "DBACCESS_HID_DLG_ADABAS_DOMAINPWD"
-#define HID_DLG_ADABAS_RESTORE "DBACCESS_HID_DLG_ADABAS_RESTORE"
-#define HID_DLG_ADABAS_PBRESTORE "DBACCESS_HID_DLG_ADABAS_PBRESTORE"
-#define HID_DLG_ADABAS_SYSDEVSPACE "DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE"
-#define HID_DLG_ADABAS_PBSYSDEVSPACE "DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE"
-#define HID_DLG_ADABAS_TRANSACTIONLOG "DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG"
-#define HID_DLG_ADABAS_PBTRANSACTIONLOG "DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG"
-#define HID_DLG_ADABAS_DATADEVSPACE "DBACCESS_HID_DLG_ADABAS_DATADEVSPACE"
-#define HID_DLG_ADABAS_PBDATADEVSPACE "DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE"
-#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE "DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE"
-#define HID_DLG_ADABAS_CON_PWD "DBACCESS_HID_DLG_ADABAS_CON_PWD"
-#define HID_DLG_ADABAS_SYS_PWD "DBACCESS_HID_DLG_ADABAS_SYS_PWD"
-#define HID_DLG_ADABAS_DOMAIN_PWD "DBACCESS_HID_DLG_ADABAS_DOMAIN_PWD"
#define HID_DLG_JOIN_TABADD "DBACCESS_HID_DLG_JOIN_TABADD"
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index fcdd4d5..1d27c5e 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1079,12 +1079,6 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
AsciiPropertyValue( "AutoIncrementCreation", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "AutoRetrievingStatement", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "IsAutoRetrievingEnabled", makeAny( (sal_Bool)sal_False ) ),
- // known Adabas D driver setting
- AsciiPropertyValue( "ShutdownDatabase", makeAny( (sal_Bool)sal_False ) ),
- AsciiPropertyValue( "DataCacheSizeIncrement", makeAny( (sal_Int32)20 ) ),
- AsciiPropertyValue( "DataCacheSize", makeAny( (sal_Int32)20 ) ),
- AsciiPropertyValue( "ControlUser", makeAny( ::rtl::OUString() ) ),
- AsciiPropertyValue( "ControlPassword", makeAny( ::rtl::OUString() ) ),
// known LDAP driver settings
AsciiPropertyValue( "HostName", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "PortNumber", makeAny( (sal_Int32)389 ) ),
diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc
index a383ed4..a7099af 100644
--- a/dbaccess/source/core/inc/dbamiscres.hrc
+++ b/dbaccess/source/core/inc/dbamiscres.hrc
@@ -32,7 +32,7 @@
// string ids (relative to other resources, that's why not unique)
#define STR_MYSQL_ODBC 1
#define STR_MYSQL_JDBC 2
-#define STR_ADABAS 3
+ // FREE
#define STR_ORACLE_JDBC 4
#define STR_JDBC 5
#define STR_ODBC 6
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index e54d0db..76f339d 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -243,12 +243,6 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
{
lcl_extractHostAndPort(sUrl,_sDatabaseName,_nPortNumber);
}
- else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:adabas:",sizeof("sdbc:adabas:")-1) )
- {
- if ( comphelper::string::getTokenCount(sUrl, ':') == 2 )
- _rsHostname = sUrl.GetToken(0,':');
- _sDatabaseName = sUrl.GetToken(comphelper::string::getTokenCount(sUrl, ':') - 1, ':');
- }
else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:mysql:mysqlc:",sizeof("sdbc:mysql:mysqlc:")-1) || _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:mysql:jdbc:",sizeof("sdbc:mysql:jdbc:")-1) )
{
lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
@@ -422,7 +416,6 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
{
KnownPrefix( "sdbc:calc:", DST_CALC, false ),
KnownPrefix( "sdbc:flat:", DST_FLAT, false ),
- KnownPrefix( "sdbc:adabas:", DST_ADABAS, false ),
KnownPrefix( "sdbc:odbc:", DST_ODBC, false ),
KnownPrefix( "sdbc:dbase:", DST_DBASE, false ),
KnownPrefix( "sdbc:mysql:odbc:", DST_MYSQL_ODBC, false ),
@@ -490,9 +483,6 @@ void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<
case DST_ORACLE_JDBC:
_rOutPathIds.push_back(PAGE_DBSETUPWIZARD_ORACLE);
break;
- case DST_ADABAS:
- _rOutPathIds.push_back(PAGE_DBSETUPWIZARD_ADABAS);
- break;
case DST_LDAP:
_rOutPathIds.push_back(PAGE_DBSETUPWIZARD_LDAP);
break;
diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx
deleted file mode 100644
index 38311fd..0000000
--- a/dbaccess/source/ext/adabas/ANewDb.cxx
+++ /dev/null
@@ -1,151 +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 "ANewDb.hxx"
-#include <cppuhelper/typeprovider.hxx>
-#include <connectivity/dbexception.hxx>
-#include "AdabasNewDb.hxx"
-#include "adabasuistrings.hrc"
-#include <vcl/msgbox.hxx>
-
-using namespace adabasui;
-using namespace dbtools;
-
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdb;
-
-extern "C" void SAL_CALL createRegistryInfo_OAdabasCreateDialog()
-{
- static OMultiInstanceAutoRegistration< OAdabasCreateDialog > aAutoRegistration;
-}
-
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-
-//=========================================================================
-//-------------------------------------------------------------------------
-OAdabasCreateDialog::OAdabasCreateDialog(const Reference< XMultiServiceFactory >& _rxORB)
- :OAdabasCreateDialogBase(_rxORB)
- ,m_pDialog(NULL)
-{
- registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog));
- registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName));
- registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser));
- registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword));
- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser));
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword));
- registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize));
-}
-
-//-------------------------------------------------------------------------
-Sequence<sal_Int8> SAL_CALL OAdabasCreateDialog::getImplementationId( ) throw(RuntimeException)
-{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
-}
-
-//-------------------------------------------------------------------------
-Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
-{
- return *(new OAdabasCreateDialog(_rxFactory));
-}
-
-//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OAdabasCreateDialog::getImplementationName() throw(RuntimeException)
-{
- return getImplementationName_Static();
-}
-
-//-------------------------------------------------------------------------
-::rtl::OUString OAdabasCreateDialog::getImplementationName_Static() throw(RuntimeException)
-{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.adabasui.AdabasCreateDialog"));
-}
-
-//-------------------------------------------------------------------------
-::comphelper::StringSequence SAL_CALL OAdabasCreateDialog::getSupportedServiceNames() throw(RuntimeException)
-{
- return getSupportedServiceNames_Static();
-}
-
-//-------------------------------------------------------------------------
-::comphelper::StringSequence OAdabasCreateDialog::getSupportedServiceNames_Static() throw(RuntimeException)
-{
- ::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdabasCreationDialog"));
- return aSupported;
-}
-
-//-------------------------------------------------------------------------
-Reference<XPropertySetInfo> SAL_CALL OAdabasCreateDialog::getPropertySetInfo() throw(RuntimeException)
-{
- Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
-}
-
-//-------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper& OAdabasCreateDialog::getInfoHelper()
-{
- return *const_cast<OAdabasCreateDialog*>(this)->getArrayHelper();
-}
-
-//------------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper* OAdabasCreateDialog::createArrayHelper( ) const
-{
- Sequence< Property > aProps;
- describeProperties(aProps);
- return new ::cppu::OPropertyArrayHelper(aProps);
-}
-
-//------------------------------------------------------------------------------
-Dialog* OAdabasCreateDialog::createDialog(Window* _pParent)
-{
- if(!m_xCreateCatalog.is())
- throw SQLException();
- m_pDialog = new OAdabasNewDbDlg(_pParent,m_xCreateCatalog,m_aContext.getLegacyServiceFactory());
- return m_pDialog;
-}
-// -----------------------------------------------------------------------------
-void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult)
-{
- if(m_pDialog && _nExecutionResult == RET_OK)
- { // fill the variables
- m_sDatabaseName = m_pDialog->GetDatabaseName();
- m_sControlUser = m_pDialog->GetControlUser();
- m_sControlPassword = m_pDialog->GetControlPassword();
- m_sUser = m_pDialog->GetUser();
- m_sUserPassword = m_pDialog->GetUserPassword();
- m_nCacheSize = m_pDialog->GetCacheSize();
- }
-}
-// -----------------------------------------------------------------------------
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx
deleted file mode 100644
index cf72593..0000000
--- a/dbaccess/source/ext/adabas/ANewDb.hxx
+++ /dev/null
@@ -1,97 +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 ADABASUI_NEWDB_HXX
-#define ADABASUI_NEWDB_HXX
-
-#include <svtools/genericunodialog.hxx>
-#include "Acomponentmodule.hxx"
-#include <com/sun/star/sdbcx/XCreateCatalog.hpp>
-
-
-
-//.........................................................................
-namespace adabasui
-{
-//.........................................................................
- class OAdabasNewDbDlg;
- typedef ::svt::OGenericUnoDialog OAdabasCreateDialogBase;
- class OAdabasCreateDialog
- :public OAdabasCreateDialogBase
- ,public ::comphelper::OPropertyArrayUsageHelper< OAdabasCreateDialog >
- ,public OModuleResourceClient
- {
- protected:
- OAdabasNewDbDlg* m_pDialog; // just to avoid a cast
- // <properties>
- ::rtl::OUString m_sDatabaseName;
- ::rtl::OUString m_sControlUser;
- ::rtl::OUString m_sControlPassword;
- ::rtl::OUString m_sUser;
- ::rtl::OUString m_sUserPassword;
- sal_Int32 m_nCacheSize;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
- // </properties>
- protected:
- OAdabasCreateDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
-
- public:
- // XTypeProvider
- virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException);
-
- // XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
-
- // XServiceInfo - static methods
- static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException );
- static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException );
- static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
- SAL_CALL Create(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&);
-
- // XPropertySet
- virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException);
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-
- // OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
- protected:
- // OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent);
- virtual void executedDialog(sal_Int16 _nExecutionResult);
- };
-//.........................................................................
-} // namespace adabasui
-//.........................................................................
-
-#endif // ADABASUI_NEWDB_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
deleted file mode 100644
index be2c27a..0000000
--- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
+++ /dev/null
@@ -1,59 +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 ADABASUI_SQLNAMEEDIT_HXX
-#define ADABASUI_SQLNAMEEDIT_HXX
-
-#include <vcl/edit.hxx>
-#include <vcl/combobox.hxx>
-
-namespace adabasui
-{
- class OSQLNameChecker
- {
- public:
- sal_Bool checkString(const ::rtl::OUString& _sOldValue,const ::rtl::OUString& _sToCheck,::rtl::OUString& _rsCorrected);
- };
- //==================================================================
- class OSQLNameEdit : public Edit
- ,public OSQLNameChecker
- {
- public:
- OSQLNameEdit(Window* _pParent,const ResId& _rRes)
- : Edit(_pParent,_rRes)
- {
- }
-
- // Edit
- virtual void Modify();
- };
-}
-#endif // DBAUI_SQLNAMEEDIT_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
deleted file mode 100644
index 4745568..0000000
--- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
+++ /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.
- *
- ************************************************************************/
-
-#include "ASQLNameEdit.hxx"
-namespace adabasui
-{
- //------------------------------------------------------------------
- sal_Bool isCharOk(sal_Unicode _cChar)
- {
- return (
- (_cChar >= 'A' && _cChar <= 'Z') ||
- _cChar == '_' ||
- ((_cChar >= '0' && _cChar <= '9')) ||
- ((_cChar >= 'a' && _cChar <= 'z'))
- );
- }
- //------------------------------------------------------------------
- sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
- const ::rtl::OUString& _sToCheck,
- ::rtl::OUString& _rsCorrected)
- {
- sal_Bool bCorrected = sal_False;
- XubString sSavedValue = _sOldValue;
- XubString sText = _sToCheck;
- xub_StrLen nMatch = 0;
- for ( xub_StrLen i=nMatch;i < sText.Len(); ++i )
- {
- if ( !isCharOk( sText.GetBuffer()[i]) )
- {
- _rsCorrected += sText.Copy( nMatch, i - nMatch );
- bCorrected = sal_True;
- nMatch = i + 1;
- }
- }
- _rsCorrected += sText.Copy( nMatch, sText.Len() - nMatch );
- return bCorrected;
- }
- //------------------------------------------------------------------
- void OSQLNameEdit::Modify()
- {
- ::rtl::OUString sCorrected;
- if ( checkString( GetSavedValue(),GetText(),sCorrected ) )
- {
- Selection aSel = GetSelection();
- aSel.setMax( aSel.getMin() );
- SetText( sCorrected, aSel );
-
- SaveValue();
- }
- Edit::Modify();
- }
-}
-// -----------------------------------------------------------------------------
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
deleted file mode 100644
index f139b02..0000000
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ /dev/null
@@ -1,295 +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 "Acomponentmodule.hxx"
-
-#include <tools/resmgr.hxx>
-#include <svl/solar.hrc>
-#include <comphelper/sequence.hxx>
-#include <osl/diagnose.h>
-
-#define ENTER_MOD_METHOD() \
- ::osl::MutexGuard aGuard(s_aMutex); \
- ensureImpl()
-
-//.........................................................................
-namespace COMPMOD_NAMESPACE
-{
-//.........................................................................
-
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::registry;
- using namespace ::comphelper;
- using namespace ::cppu;
-
- //=========================================================================
- //= OModuleImpl
- //=========================================================================
- /** implementation for <type>OModule</type>. not threadsafe, has to be guarded by it's owner
- */
- class OModuleImpl
- {
- ResMgr* m_pRessources;
- sal_Bool m_bInitialized;
- ByteString m_sFilePrefix;
-
- public:
- /// ctor
- OModuleImpl();
- ~OModuleImpl();
-
- /// get the manager for the ressources of the module
- ResMgr* getResManager();
- void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
- };
-
- //-------------------------------------------------------------------------
- OModuleImpl::OModuleImpl()
- :m_pRessources(NULL)
- ,m_bInitialized(sal_False)
- {
- }
-
- //-------------------------------------------------------------------------
- OModuleImpl::~OModuleImpl()
- {
- if (m_pRessources)
- delete m_pRessources;
- }
-
- //-------------------------------------------------------------------------
- ResMgr* OModuleImpl::getResManager()
- {
- // note that this method is not threadsafe, which counts for the whole class !
- if (!m_pRessources && !m_bInitialized)
- {
- OSL_ENSURE(m_sFilePrefix.Len(), "OModuleImpl::getResManager: no resource file prefix!");
- // create a manager with a fixed prefix
- ByteString aMgrName = m_sFilePrefix;
-
- m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
- OSL_ENSURE(m_pRessources,
- (ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ")
- += aMgrName
- += ByteString(")!")).GetBuffer());
-
- m_bInitialized = sal_True;
- }
- return m_pRessources;
- }
-
- //=========================================================================
- //= OModule
- //=========================================================================
- ::osl::Mutex OModule::s_aMutex;
- sal_Int32 OModule::s_nClients = 0;
- OModuleImpl* OModule::s_pImpl = NULL;
- ::rtl::OString OModule::s_sResPrefix;
- //-------------------------------------------------------------------------
- ResMgr* OModule::getResManager()
- {
- ENTER_MOD_METHOD();
- return s_pImpl->getResManager();
- }
-
- //-------------------------------------------------------------------------
- void OModule::setResourceFilePrefix(const ::rtl::OString& _rPrefix)
- {
- ::osl::MutexGuard aGuard(s_aMutex);
- s_sResPrefix = _rPrefix;
- if (s_pImpl)
- s_pImpl->setResourceFilePrefix(_rPrefix);
- }
-
- //-------------------------------------------------------------------------
- void OModule::registerClient()
- {
- ::osl::MutexGuard aGuard(s_aMutex);
- ++s_nClients;
- }
-
- //-------------------------------------------------------------------------
- void OModule::revokeClient()
- {
- ::osl::MutexGuard aGuard(s_aMutex);
- if (!--s_nClients && s_pImpl)
- {
- delete s_pImpl;
- s_pImpl = NULL;
- }
- }
-
- //-------------------------------------------------------------------------
- void OModule::ensureImpl()
- {
- if (s_pImpl)
- return;
- s_pImpl = new OModuleImpl();
- s_pImpl->setResourceFilePrefix(s_sResPrefix);
- }
-
- //--------------------------------------------------------------------------
- //- registration helper
- //--------------------------------------------------------------------------
-
- Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL;
- Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL;
- Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL;
- Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL;
-
- //--------------------------------------------------------------------------
- void OModule::registerComponent(
- const ::rtl::OUString& _rImplementationName,
- const Sequence< ::rtl::OUString >& _rServiceNames,
- ComponentInstantiation _pCreateFunction,
- FactoryInstantiation _pFactoryFunction)
- {
- if (!s_pImplementationNames)
- {
- OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
- "OModule::registerComponent : inconsistent state (the pointers (1)) !");
- s_pImplementationNames = new Sequence< ::rtl::OUString >;
- s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >;
- s_pCreationFunctionPointers = new Sequence< sal_Int64 >;
- s_pFactoryFunctionPointers = new Sequence< sal_Int64 >;
- }
- OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
- "OModule::registerComponent : inconsistent state (the pointers (2)) !");
-
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
- "OModule::registerComponent : inconsistent state !");
-
- sal_Int32 nOldLen = s_pImplementationNames->getLength();
- s_pImplementationNames->realloc(nOldLen + 1);
- s_pSupportedServices->realloc(nOldLen + 1);
- s_pCreationFunctionPointers->realloc(nOldLen + 1);
- s_pFactoryFunctionPointers->realloc(nOldLen + 1);
-
- s_pImplementationNames->getArray()[nOldLen] = _rImplementationName;
- s_pSupportedServices->getArray()[nOldLen] = _rServiceNames;
- s_pCreationFunctionPointers->getArray()[nOldLen] = reinterpret_cast<sal_Int64>(_pCreateFunction);
- s_pFactoryFunctionPointers->getArray()[nOldLen] = reinterpret_cast<sal_Int64>(_pFactoryFunction);
- }
-
- //--------------------------------------------------------------------------
- void OModule::revokeComponent(const ::rtl::OUString& _rImplementationName)
- {
- if (!s_pImplementationNames)
- {
- OSL_FAIL("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?");
- return;
- }
- OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
- "OModule::revokeComponent : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
- "OModule::revokeComponent : inconsistent state !");
-
- sal_Int32 nLen = s_pImplementationNames->getLength();
- const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray();
- for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames)
- {
- if (pImplNames->equals(_rImplementationName))
- {
- removeElementAt(*s_pImplementationNames, i);
- removeElementAt(*s_pSupportedServices, i);
- removeElementAt(*s_pCreationFunctionPointers, i);
- removeElementAt(*s_pFactoryFunctionPointers, i);
- break;
- }
- }
-
- if (s_pImplementationNames->getLength() == 0)
- {
- delete s_pImplementationNames; s_pImplementationNames = NULL;
- delete s_pSupportedServices; s_pSupportedServices = NULL;
- delete s_pCreationFunctionPointers; s_pCreationFunctionPointers = NULL;
- delete s_pFactoryFunctionPointers; s_pFactoryFunctionPointers = NULL;
- }
- }
-
- //--------------------------------------------------------------------------
- Reference< XInterface > OModule::getComponentFactory(
- const ::rtl::OUString& _rImplementationName,
- const Reference< XMultiServiceFactory >& _rxServiceManager)
- {
- OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
- OSL_ENSURE(!_rImplementationName.isEmpty(), "OModule::getComponentFactory : invalid argument (implementation name) !");
-
- if (!s_pImplementationNames)
- {
- OSL_FAIL("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?");
- return NULL;
- }
- OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
- "OModule::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
- "OModule::getComponentFactory : inconsistent state !");
-
-
- Reference< XInterface > xReturn;
-
-
- sal_Int32 nLen = s_pImplementationNames->getLength();
- const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
- const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
- const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray();
- const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray();
-
- for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices, ++pComponentFunction, ++pFactoryFunction)
- {
- if (pImplName->equals(_rImplementationName))
- {
- const FactoryInstantiation FactoryInstantiationFunction = reinterpret_cast<const FactoryInstantiation>(*pFactoryFunction);
- const ComponentInstantiation ComponentInstantiationFunction = reinterpret_cast<const ComponentInstantiation>(*pComponentFunction);
-
- xReturn = FactoryInstantiationFunction( _rxServiceManager, *pImplName, ComponentInstantiationFunction, *pServices, NULL);
- if (xReturn.is())
- {
- xReturn->acquire();
- return xReturn.get();
- }
- }
- }
-
- return NULL;
- }
-
-
-//.........................................................................
-} // namespace COMPMOD_NAMESPACE
-//.........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
deleted file mode 100644
index 7625ca2..0000000
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ /dev/null
@@ -1,265 +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 _EXTENSIONS_COMPONENT_MODULE_HXX_
-#define _EXTENSIONS_COMPONENT_MODULE_HXX_
-
-/** you may find this file helpfull if you implement a component (in it's own library) which can't use
- the usual infrastructure.<br/>
- More precise, you find helper classes to ease the use of resources and the registration of services.
- <p>
- You need to define a preprocessor variable COMPMOD_NAMESPACE in order to use this file. Set it to a string
- which should be used as namespace for the classes defined herein.</p>
-*/
-
-#include <osl/mutex.hxx>
-#include <tools/resid.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <cppuhelper/factory.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list