diff options
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 13 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/dp_backenddb.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/inc/dp_backenddb.hxx | 3 |
3 files changed, 5 insertions, 16 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index dc737dd7947f..4584862d19db 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -78,8 +78,6 @@ namespace beans = com::sun::star::beans; namespace util = com::sun::star::util; namespace css = com::sun::star; -//#define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) - using ::com::sun::star::uno::Reference; using ::rtl::OUString; @@ -90,7 +88,6 @@ struct CompIdentifiers bool operator() (::std::vector<Reference<deploy::XPackage> > const & a, ::std::vector<Reference<deploy::XPackage> > const & b) { - if (getName(a).compareTo(getName(b)) < 0) return true; return false; @@ -170,7 +167,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard() } } -} //end namespace +} namespace dp_manager { @@ -227,7 +224,7 @@ ExtensionManager::getPackageManager(::rtl::OUString const & repository) Enters the XPackage objects into a map. They must be all from the same repository. The value type of the map is a vector, where each vector represents an extension with a particular identifier. The first member - is represents the user extension, the second the shared extension and the + represents the user extension, the second the shared extension and the third the bundled extension. */ void ExtensionManager::addExtensionsToMap( @@ -266,8 +263,8 @@ void ExtensionManager::addExtensionsToMap( /* returns a list containing extensions with the same identifier from - all repositories (user, shared, bundled) If one repository does not - have this extension, then the list contains an empty Referenc. The list + all repositories (user, shared, bundled). If one repository does not + have this extension, then the list contains an empty Reference. The list is ordered according to the priority of the repostories: 1. user 2. shared @@ -712,7 +709,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( } //check again dependencies but prevent user interaction, //We can disregard the license, because the user must have already - //accepted it, whe we called checkPrerequisites the first time + //accepted it, when we called checkPrerequisites the first time SilentCheckPrerequisitesCommandEnv * pSilentCommandEnv = new SilentCheckPrerequisitesCommandEnv(); Reference<ucb::XCommandEnvironment> silentCommandEnv(pSilentCommandEnv); diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index a93bc0b45093..4c4d6354b0ac 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -566,13 +566,10 @@ OUString BackendDb::readSimpleElement( } - -//================================================================================ RegisteredDb::RegisteredDb( Reference<XComponentContext> const & xContext, ::rtl::OUString const & url):BackendDb(xContext, url) { - } void RegisteredDb::addEntry(::rtl::OUString const & url) @@ -626,7 +623,6 @@ bool RegisteredDb::getEntry(::rtl::OUString const & url) Reference<css::xml::dom::XNode> root = doc->getFirstChild(); Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI(); - //find the extension element that is to be removed Reference<css::xml::dom::XNode> aNode = xpathApi->selectSingleNode(root, sExpression); if (!aNode.is()) @@ -644,7 +640,6 @@ bool RegisteredDb::getEntry(::rtl::OUString const & url) } } - } // namespace backend } // namespace dp_registry diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 5e9b6c0cf703..e06538595cb7 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -140,8 +140,6 @@ protected: */ virtual ::rtl::OUString getKeyElementName()=0; - - public: BackendDb(css::uno::Reference<css::uno::XComponentContext> const & xContext, ::rtl::OUString const & url); @@ -164,7 +162,6 @@ public: }; - } } #endif |