diff options
author | Joseph Powers <jpowers27@cox.net> | 2011-08-18 07:33:10 -0700 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2011-08-18 07:42:10 -0700 |
commit | e745ff93d0e15e831bb857c1881af6250f37911d (patch) | |
tree | 12759eae1de378a9cb4acc3df93ab9038662ee3f /comphelper | |
parent | 4ae8b026a4eb2fc3585c913d0d3a613ed14a8ba3 (diff) |
unusedeasy: cleanup comphelper::MediaDescriptor
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/inc/comphelper/mediadescriptor.hxx | 15 | ||||
-rw-r--r-- | comphelper/source/misc/mediadescriptor.cxx | 87 |
2 files changed, 0 insertions, 102 deletions
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index cc36fc62282e..55b89a25fdf8 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.hxx @@ -74,17 +74,12 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap */ static const ::rtl::OUString& PROP_ABORTED(); static const ::rtl::OUString& PROP_ASTEMPLATE(); - static const ::rtl::OUString& PROP_CHARACTERSET(); static const ::rtl::OUString& PROP_COMPONENTDATA(); - static const ::rtl::OUString& PROP_DEEPDETECTION(); - static const ::rtl::OUString& PROP_DETECTSERVICE(); static const ::rtl::OUString& PROP_DOCUMENTSERVICE(); static const ::rtl::OUString& PROP_ENCRYPTIONDATA(); - static const ::rtl::OUString& PROP_EXTENSION(); static const ::rtl::OUString& PROP_FILENAME(); static const ::rtl::OUString& PROP_FILTERNAME(); static const ::rtl::OUString& PROP_FILTEROPTIONS(); - static const ::rtl::OUString& PROP_FORMAT(); static const ::rtl::OUString& PROP_FRAME(); static const ::rtl::OUString& PROP_FRAMENAME(); static const ::rtl::OUString& PROP_HIDDEN(); @@ -98,33 +93,25 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap static const ::rtl::OUString& PROP_OPENNEWVIEW(); static const ::rtl::OUString& PROP_OUTPUTSTREAM(); static const ::rtl::OUString& PROP_PASSWORD(); - static const ::rtl::OUString& PROP_PATTERN(); - static const ::rtl::OUString& PROP_POSSIZE(); static const ::rtl::OUString& PROP_POSTDATA(); - static const ::rtl::OUString& PROP_POSTSTRING(); static const ::rtl::OUString& PROP_PREVIEW(); static const ::rtl::OUString& PROP_READONLY(); static const ::rtl::OUString& PROP_REFERRER(); static const ::rtl::OUString& PROP_SALVAGEDFILE(); - static const ::rtl::OUString& PROP_SILENT(); static const ::rtl::OUString& PROP_STATUSINDICATOR(); static const ::rtl::OUString& PROP_STREAM(); static const ::rtl::OUString& PROP_STREAMFOROUTPUT(); static const ::rtl::OUString& PROP_TEMPLATENAME(); - static const ::rtl::OUString& PROP_TEMPLATEREGIONNAME(); static const ::rtl::OUString& PROP_TITLE(); static const ::rtl::OUString& PROP_TYPENAME(); static const ::rtl::OUString& PROP_UCBCONTENT(); static const ::rtl::OUString& PROP_UPDATEDOCMODE(); static const ::rtl::OUString& PROP_URL(); static const ::rtl::OUString& PROP_VERSION(); - static const ::rtl::OUString& PROP_VIEWID(); - static const ::rtl::OUString& PROP_REPAIRPACKAGE(); static const ::rtl::OUString& PROP_DOCUMENTTITLE(); static const ::rtl::OUString& PROP_MODEL(); static const ::rtl::OUString& PROP_VIEWONLY(); static const ::rtl::OUString& PROP_DOCUMENTBASEURL(); - static const ::rtl::OUString& PROP_VIEWCONTROLLERNAME(); //------------------------------------------- // interface @@ -137,9 +124,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap the default ctors of the compiler :-(. */ MediaDescriptor(); - MediaDescriptor(const ::com::sun::star::uno::Any& aSource); MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); - MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); //--------------------------------------- /** @short it checks if the descriptor already has a valid diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 68a2999b738e..321573d3307d 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -81,30 +81,12 @@ const ::rtl::OUString& MediaDescriptor::PROP_ASTEMPLATE() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_CHARACTERSET() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("CharacterSet")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_COMPONENTDATA() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("ComponentData")); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_DEEPDETECTION() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("DeepDetection")); - return sProp; -} - -const ::rtl::OUString& MediaDescriptor::PROP_DETECTSERVICE() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("DetectService")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("DocumentService")); @@ -117,12 +99,6 @@ const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_EXTENSION() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Extension")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_FILENAME() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("FileName")); @@ -141,12 +117,6 @@ const ::rtl::OUString& MediaDescriptor::PROP_FILTEROPTIONS() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FORMAT() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Format")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_FRAME() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Frame")); @@ -219,30 +189,12 @@ const ::rtl::OUString& MediaDescriptor::PROP_OUTPUTSTREAM() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_PATTERN() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Pattern")); - return sProp; -} - -const ::rtl::OUString& MediaDescriptor::PROP_POSSIZE() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("PosSize")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_POSTDATA() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("PostData")); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_POSTSTRING() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("PostString")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_PREVIEW() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Preview")); @@ -261,12 +213,6 @@ const ::rtl::OUString& MediaDescriptor::PROP_REFERRER() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_SILENT() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Silent")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_STATUSINDICATOR() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator")); @@ -291,12 +237,6 @@ const ::rtl::OUString& MediaDescriptor::PROP_TEMPLATENAME() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_TEMPLATEREGIONNAME() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("TemplateRegionName")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_TYPENAME() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("TypeName")); @@ -327,18 +267,6 @@ const ::rtl::OUString& MediaDescriptor::PROP_VERSION() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_VIEWID() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("ViewId")); - return sProp; -} - -const ::rtl::OUString& MediaDescriptor::PROP_REPAIRPACKAGE() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")); - return sProp; -} - const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTTITLE() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")); @@ -381,11 +309,6 @@ const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTBASEURL() return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_VIEWCONTROLLERNAME() -{ - static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("ViewControllerName")); - return sProp; -} /*----------------------------------------------- 10.03.2004 08:09 -----------------------------------------------*/ @@ -394,21 +317,11 @@ MediaDescriptor::MediaDescriptor() { } -MediaDescriptor::MediaDescriptor(const css::uno::Any& aSource) - : SequenceAsHashMap(aSource) -{ -} - MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::PropertyValue >& lSource) : SequenceAsHashMap(lSource) { } -MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::NamedValue >& lSource) - : SequenceAsHashMap(lSource) -{ -} - sal_Bool MediaDescriptor::isStreamReadOnly() const { static ::rtl::OUString CONTENTSCHEME_FILE( RTL_CONSTASCII_USTRINGPARAM( "file" )); |