[Libreoffice-commits] core.git: 2 commits - connectivity/source filter/source include/connectivity include/sfx2 jvmfwk/source sfx2/source sw/inc unusedcode.easy
Caolán McNamara
caolanm at redhat.com
Mon Dec 8 02:09:54 PST 2014
connectivity/source/commontools/predicateinput.cxx | 50 -----------
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 7 +
include/connectivity/predicateinput.hxx | 5 -
include/sfx2/lnkbase.hxx | 3
jvmfwk/source/fwkutil.cxx | 12 --
jvmfwk/source/fwkutil.hxx | 4
sfx2/source/appl/lnkbase2.cxx | 85 +++++++++----------
sw/inc/swbaslnk.hxx | 7 -
unusedcode.easy | 3
9 files changed, 52 insertions(+), 124 deletions(-)
New commits:
commit cca2e7be89a29bd06a65ea85f2feca3783e62d6a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 8 09:50:52 2014 +0000
Related: rhbz#1164614 better default size for no xslt entries case
Change-Id: I75dd1210b4e8e5e7cb2c2ce1e83e085a9c480b91
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 02143c4..c021300 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1390,7 +1390,12 @@ void SvxPathControl::Resize()
Size SvxPathControl::GetOptimalSize() const
{
- return m_pVBox->GetOptimalSize();
+ Size aDefSize(LogicToPixel(Size(150, 0), MapMode(MAP_APPFONT)));
+ Size aOptSize(m_pVBox->GetOptimalSize());
+ long nRowHeight(GetTextHeight());
+ aOptSize.Height() = nRowHeight * 10;
+ aOptSize.Width() = std::max(aDefSize.Width(), aOptSize.Width());
+ return aOptSize;
}
SvxPathControl::~SvxPathControl()
commit 6d8b06224cf1819c8af543927d7a80e937c50a94
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 8 09:16:06 2014 +0000
callcatcher: update unused code
Change-Id: I3cd65d112339fa9c67ed462fe39acbbef91d4d8d
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 94a4d3d..bbb0863 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -387,56 +387,6 @@ namespace dbtools
return Any();
}
- Any OPredicateInputController::getPredicateValue(
- const OUString& _sField, const OUString& _rPredicateValue, OUString* _pErrorMessage ) const
- {
- OUString sError;
- OUString sField = _sField;
- sal_Int32 nIndex = 0;
- sField = sField.getToken(0,'(',nIndex);
- if(nIndex == -1)
- sField = _sField;
- sal_Int32 nType = ::connectivity::OSQLParser::getFunctionReturnType(sField,&m_aParser.getContext());
- if ( nType == DataType::OTHER || sField.isEmpty() )
- {
- // first try the international version
- OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue;
- boost::scoped_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true ) );
- nType = DataType::DOUBLE;
- if ( pParseNode.get() )
- {
- OSQLParseNode* pColumnRef = pParseNode->getByRule(OSQLParseNode::column_ref);
- if ( pColumnRef )
- {
- }
- }
- }
-
- Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- parse::OParseColumn* pColumn = new parse::OParseColumn( sField,
- OUString(),
- OUString(),
- OUString(),
- ColumnValue::NULLABLE_UNKNOWN,
- 0,
- 0,
- nType,
- false,
- false,
- xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
- OUString(),
- OUString(),
- OUString());
- Reference<XPropertySet> xColumn = pColumn;
- pColumn->setFunction(true);
- pColumn->setRealName(sField);
-
- OSQLParseNode* pParseNode = implPredicateTree( sError, _rPredicateValue, xColumn );
- if ( _pErrorMessage )
- *_pErrorMessage = sError;
- return pParseNode ? implParseNode(pParseNode, false) : Any();
- }
-
Any OPredicateInputController::implParseNode(OSQLParseNode* pParseNode, bool _bForStatementUse) const
{
if ( ! pParseNode )
diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx
index 549824e..54dbaea 100644
--- a/include/connectivity/predicateinput.hxx
+++ b/include/connectivity/predicateinput.hxx
@@ -112,11 +112,6 @@ namespace dbtools
OUString* _pErrorMessage = NULL
) const;
- ::com::sun::star::uno::Any getPredicateValue(
- const OUString& _sField
- , const OUString& _rPredicateValue
- , OUString* _pErrorMessage = NULL) const;
-
private:
::connectivity::OSQLParseNode* implPredicateTree(
OUString& _rErrorMessage,
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index a68bf49..d88e53d 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -112,8 +112,11 @@ public:
TYPEINFO();
virtual void Closed();
+
+#if defined WNT
SvBaseLink( const OUString& rNm, sal_uInt16 nObjectType,
SvLinkSource* );
+#endif
sal_uInt16 GetObjType() const { return nObjType; }
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index b6a6eef..fc8feb3 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -183,18 +183,6 @@ OUString getDirFromFile(const OUString& usFilePath)
return OUString(usFilePath.getStr(), index);
}
-OUString getExecutableDirectory()
-{
- rtl_uString* sExe = NULL;
- if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function getExecutableDirectory (fwkutil.cxx)");
-
- OUString ouExe(sExe, SAL_NO_ACQUIRE);
- return getDirFromFile(ouExe);
-}
-
OUString getLibraryLocation()
{
OString sExcMsg("[Java framework] Error in function getLibraryLocation "
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index af157d0..6168d35 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -76,10 +76,6 @@ OUString getPlatform();
OUString getDirFromFile(const OUString& usFilePath);
-/** Returns the file URL of the folder where the executable resides.
- */
-OUString getExecutableDirectory();
-
enum FileStatus
{
FILE_OK,
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 1bcd28f..8b5b0e5 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -40,8 +40,6 @@ namespace sfx2
TYPEINIT0( SvBaseLink )
-static DdeTopic* FindTopic( const OUString &, sal_uInt16* = 0 );
-
class ImplDdeItem;
struct BaseLink_Impl
@@ -150,7 +148,47 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
pImplData->ClientType.bIntrnlLnk = false;
}
+#if defined WNT
+static DdeTopic* FindTopic( const OUString & rLinkName, sal_uInt16* pItemStt )
+{
+ if( rLinkName.isEmpty() )
+ return 0;
+
+ OUString sNm( rLinkName );
+ sal_Int32 nTokenPos = 0;
+ OUString sService( sNm.getToken( 0, cTokenSeparator, nTokenPos ) );
+
+ DdeServices& rSvc = DdeService::GetServices();
+ for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI)
+ {
+ DdeService* pService = *aI;
+ if( pService->GetName() == sService )
+ {
+ // then we search for the Topic
+ OUString sTopic( sNm.getToken( 0, cTokenSeparator, nTokenPos ) );
+ if( pItemStt )
+ *pItemStt = nTokenPos;
+
+ std::vector<DdeTopic*>& rTopics = pService->GetTopics();
+
+ for( int i = 0; i < 2; ++i )
+ {
+ for( std::vector<DdeTopic*>::iterator iterTopic = rTopics.begin();
+ iterTopic != rTopics.end(); ++iterTopic )
+ if( (*iterTopic)->GetName() == sTopic )
+ return *iterTopic;
+
+ // Topic not found?
+ // then we try once to create it
+ if( i || !pService->MakeTopic( sTopic ) )
+ break; // did not work, exiting
+ }
+ break;
+ }
+ }
+ return 0;
+}
SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
: pImpl(0)
@@ -189,7 +227,7 @@ SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLin
xObj = pObj;
}
-
+#endif
SvBaseLink::~SvBaseLink()
{
@@ -596,47 +634,6 @@ void ImplDdeItem::AdviseLoop( bool bOpen )
}
}
-
-static DdeTopic* FindTopic( const OUString & rLinkName, sal_uInt16* pItemStt )
-{
- if( rLinkName.isEmpty() )
- return 0;
-
- OUString sNm( rLinkName );
- sal_Int32 nTokenPos = 0;
- OUString sService( sNm.getToken( 0, cTokenSeparator, nTokenPos ) );
-
- DdeServices& rSvc = DdeService::GetServices();
- for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI)
- {
- DdeService* pService = *aI;
- if( pService->GetName() == sService )
- {
- // then we search for the Topic
- OUString sTopic( sNm.getToken( 0, cTokenSeparator, nTokenPos ) );
- if( pItemStt )
- *pItemStt = nTokenPos;
-
- std::vector<DdeTopic*>& rTopics = pService->GetTopics();
-
- for( int i = 0; i < 2; ++i )
- {
- for( std::vector<DdeTopic*>::iterator iterTopic = rTopics.begin();
- iterTopic != rTopics.end(); ++iterTopic )
- if( (*iterTopic)->GetName() == sTopic )
- return *iterTopic;
-
- // Topic not found?
- // then we try once to create it
- if( i || !pService->MakeTopic( sTopic ) )
- break; // did not work, exiting
- }
- break;
- }
- }
- return 0;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index a47ae6a..f32b7b4 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -39,13 +39,6 @@ class SwBaseLink : public ::sfx2::SvBaseLink
protected:
SwBaseLink(): m_pReReadThread(0) {}
- SwBaseLink( const OUString& rNm, sal_uInt16 nObjectType, ::sfx2::SvLinkSource* pObj,
- SwCntntNode* pNode = 0 )
- : ::sfx2::SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ),
- bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
- m_pReReadThread(0)
- {}
-
public:
TYPEINFO_OVERRIDE();
diff --git a/unusedcode.easy b/unusedcode.easy
index fe2e1a5..ee18f77 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -8,6 +8,7 @@ GDriveSession::GDriveSession()
ImpBitmap::ImplCrop(Rectangle const&)
ImpBitmap::ImplErase(Color const&)
ImpBitmap::ImplSetSalBitmap(SalBitmap*)
+NfCurrencyEntry::Clone() const
OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int)
OpenGLContext::renderToFile()
OpenGLContext::requestSingleBufferedRendering()
@@ -190,6 +191,7 @@ sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::finish()
sc::CLBuildKernelThread::produce()
sc::CellValues::transferTo(ScColumn&, int)
+sc::ColumnSpanSet::swap(sc::ColumnSpanSet&)
sc::FormulaGroupAreaListener::getGroupLength() const
sc::FormulaGroupAreaListener::getRange() const
sc::FormulaGroupAreaListener::getTopCellPos() const
@@ -198,7 +200,6 @@ sc::FormulaGroupAreaListener::isStartFixed() const
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sdr::contact::ViewContactOfTextObj::GetTextObj() const
-sfx2::SvBaseLink::SvBaseLink(rtl::OUString const&, unsigned short, sfx2::SvLinkSource*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
More information about the Libreoffice-commits
mailing list