summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2010-03-23 15:03:04 +0100
committerMikhail Voytenko <mav@openoffice.org>2010-03-23 15:03:04 +0100
commita203dad5a7670ee1e42b6df0021eea188ba0e70c (patch)
tree77b71ac285870d2ae8b0a5f1f89aa94815d36a5b
parentf338d8b6cedfa35f1fc8e2779bf3289d6075a480 (diff)
fwk138: #i105549# integrate the patch
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx19
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx11
-rw-r--r--extensions/source/nsplugin/source/so_env.cxx21
-rw-r--r--extensions/source/nsplugin/source/so_env.hxx3
-rw-r--r--extensions/source/nsplugin/source/so_instance.cxx8
-rw-r--r--extensions/source/nsplugin/source/so_instance.hxx1
-rw-r--r--extensions/source/nsplugin/source/so_main.cxx10
-rw-r--r--extensions/source/propctrlr/browserline.cxx6
-rw-r--r--extensions/source/propctrlr/browserline.hxx1
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx19
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx8
-rw-r--r--extensions/source/propctrlr/handlerhelper.hxx8
13 files changed, 0 insertions, 117 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index b6d5298b7712..253e7d9e2d6e 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -347,25 +347,6 @@ namespace abp
//= ODataSource
//=====================================================================
//---------------------------------------------------------------------
- ODataSource::ODataSource( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rName )
- :m_pImpl(new ODataSourceImpl(_rxORB))
- {
- try
- {
- // get the data source context
- Reference< XNameAccess > xContext = lcl_getDataSourceContext( m_pImpl->xORB );
-
- // retrieve the UNO data source
- if (xContext.is())
- xContext->getByName( _rName ) >>= m_pImpl->xDataSource;
- }
- catch(const Exception&)
- {
- DBG_ERROR("ODataSource::ODataSource: could not access the requested data source (caught an exception)!");
- }
- }
-
- //---------------------------------------------------------------------
ODataSource::ODataSource( const ODataSource& _rSource )
:m_pImpl( NULL )
{
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index bcd4e64fd885..54819b9b9628 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -125,17 +125,6 @@ namespace abp
// ----------------------------------------------------------------
// - ctor/dtor/assignment
// ----------------------------------------------------------------
- /** ctor
- @param _rxORB
- the service factory to use to access the UNO objects
- @param _rName
- the name of the data source the object should represent
- */
- ODataSource(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
- const ::rtl::OUString& _rName
- );
-
/// constructs an object which is initially invalid
ODataSource(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index 36a2b3f3abec..34f4541b3330 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -210,27 +210,6 @@ const char* findProgramDir()
return sProgram;
}
-// Return: "/home/build/staroffice/program" + original system library path
-const char* getNewLibraryPath()
-{
- static char pLPATH[NPP_PATH_MAX*4] = {0};
-
- if (!pLPATH[0])
- {
- const char* pProgram = findProgramDir();
- strcpy(pLPATH, "LD_LIBRARY_PATH=");
- strcat(pLPATH, pProgram);
-
- char* pLD = getenv("LD_LIBRARY_PATH");
- if (pLD)
- {
- strcat(pLPATH, ":");
- strcat(pLPATH, pLD);
- }
- }
- return pLPATH;
-}
-
#ifdef WNT
// Return SO executable absolute path, like "/home/build/staroffice/program/soffice"
const char* findSofficeExecutable()
diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx
index a4e98a878f2a..0cf1194c2dc2 100644
--- a/extensions/source/nsplugin/source/so_env.hxx
+++ b/extensions/source/nsplugin/source/so_env.hxx
@@ -69,9 +69,6 @@
// return the install path of staroffice, return value like "/home/build/staroffice"
const char* findInstallDir();
-// return original system library path + "/home/build/staroffice/program"
-const char* getNewLibraryPath();
-
// return SO program dir absolute path, like "/home/build/staroffice/program"
const char* findProgramDir();
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 65e511dfcc35..4b1e41f724bd 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -366,14 +366,6 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
return sal_True;
}
-sal_Bool SoPluginInstance::SetSODir(char * sDir)
-{
- if(strlen(sDir) >= NPP_PATH_MAX) return sal_False;
-
- strcpy(sSO_Dir, sDir);
- return sal_True;
-}
-
sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int h)
{
sal_Bool bRetval(sal_True);
diff --git a/extensions/source/nsplugin/source/so_instance.hxx b/extensions/source/nsplugin/source/so_instance.hxx
index 17266fcefc71..e95bb7c024ec 100644
--- a/extensions/source/nsplugin/source/so_instance.hxx
+++ b/extensions/source/nsplugin/source/so_instance.hxx
@@ -103,7 +103,6 @@ public:
virtual sal_Bool Print(void) ;
static sal_Bool ShutDown(void);
- static sal_Bool SetSODir(char * sDir);
static char* GetSODir(void) {return sSO_Dir;};
long GetParent(void) {return m_pParent;};
};
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index 7932f63d6d4d..e49ce3d0c649 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -148,16 +148,6 @@ sal_Bool dump_plugin_message(PLUGIN_MSG* pMsg)
return sal_True;
}
-int prepareEnviron()
-{
- // if child process inherit the chdir() property from parent process, if yes, no getNewLibraryPath() needed
- const char* pNewLibraryPath = getNewLibraryPath();
- putenv( (char*) pNewLibraryPath );
- SoPluginInstance::SetSODir((char *)findProgramDir());
-
- return 0;
-}
-
int Set_Window(PLUGIN_MSG* pMsg)
{
dump_plugin_message(pMsg);
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 71a0bb2db3ce..108333076e19 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -320,12 +320,6 @@ namespace pcr
}
//------------------------------------------------------------------
- sal_Bool OBrowserLine::IsPropertyInputEnabled( ) const
- {
- return ( m_nEnableFlags & PropertyLineElement::InputControl ) != 0;
- }
-
- //------------------------------------------------------------------
void OBrowserLine::SetReadOnly( bool _bReadOnly )
{
if ( m_bReadOnly != _bReadOnly )
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index db747b4a6b99..7848b387d608 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -115,7 +115,6 @@ namespace pcr
void EnablePropertyControls( sal_Int16 _nControls, bool _bEnable );
void EnablePropertyLine( bool _bEnable );
- sal_Bool IsPropertyInputEnabled( ) const;
void SetReadOnly( bool _bReadOnly );
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 67257f960f5b..8a2885fc8c69 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -682,16 +682,6 @@ namespace pcr
}
//------------------------------------------------------------------------
- Any OBrowserListBox::GetPropertyValue( const ::rtl::OUString& _rEntryName ) const
- {
- Any aValue;
- ListBoxLines::const_iterator line = m_aLines.find( _rEntryName );
- if ( line != m_aLines.end() )
- aValue = impl_getControlAsPropertyValue( line->second );
- return aValue;
- }
-
- //------------------------------------------------------------------------
sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString& _rEntryName ) const
{
sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND;
@@ -722,15 +712,6 @@ namespace pcr
}
//------------------------------------------------------------------------
- sal_Bool OBrowserListBox::IsPropertyInputEnabled( const ::rtl::OUString& _rEntryName ) const
- {
- BrowserLinePointer pLine;
- if ( impl_getBrowserLineForName( _rEntryName, pLine ) )
- return pLine->IsPropertyInputEnabled();
- return sal_False;
- }
-
- //------------------------------------------------------------------------
void OBrowserListBox::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable )
{
BrowserLinePointer pLine;
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index de0ebc9dd6b6..edd9d9bd40eb 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -163,13 +163,11 @@ namespace pcr
void ChangeEntry( const OLineDescriptor&, sal_uInt16 nPos );
void SetPropertyValue( const ::rtl::OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue );
- ::com::sun::star::uno::Any GetPropertyValue( const ::rtl::OUString& rEntryName ) const;
sal_uInt16 GetPropertyPos( const ::rtl::OUString& rEntryName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >
GetPropertyControl( const ::rtl::OUString& rEntryName );
void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable );
void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable );
- sal_Bool IsPropertyInputEnabled( const ::rtl::OUString& _rEntryName ) const;
sal_Int32 GetMinimumWidth();
sal_Int32 GetMinimumHeight();
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 0e82397dae2c..ae87a85a3722 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -161,14 +161,6 @@ namespace pcr
//--------------------------------------------------------------------
Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
- const Sequence< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted )
- {
- ::std::vector< ::rtl::OUString > aAsVector( _rInitialListEntries.getConstArray(), _rInitialListEntries.getConstArray() + _rInitialListEntries.getLength() );
- return lcl_implCreateListLikeControl( _rxControlFactory, aAsVector, _bReadOnlyControl, _bSorted, sal_True );
- }
-
- //--------------------------------------------------------------------
- Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted )
{
return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_True );
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index bf42c5555f1b..e55cbf207526 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -105,14 +105,6 @@ namespace pcr
static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >
createListBoxControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rInitialListEntries,
- sal_Bool _bReadOnlyControl,
- sal_Bool _bSorted
- );
-
- static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >
- createListBoxControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory,
const ::std::vector< ::rtl::OUString >& _rInitialListEntries,
sal_Bool _bReadOnlyControl,
sal_Bool _bSorted