Kaydet (Commit) 268e4e90 authored tarafından Noel Grandin's avatar Noel Grandin

allocate and initialise FormatEntry table at compile-time

no need to init this at runtime, it's purely static data

Change-Id: I73ff5b0d8f273d7ee925f485f3ed712f117f5b40
üst 24d98199
...@@ -39,23 +39,6 @@ ...@@ -39,23 +39,6 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
struct FormatEntry
{
FormatEntry();
FormatEntry(
const char* mime_content_type,
const char* human_presentable_name,
const char* native_format_name,
CLIPFORMAT std_clipboard_format_id,
css::uno::Type const & cppu_type
);
css::datatransfer::DataFlavor aDataFlavor;
OUString aNativeFormatName;
sal_Int32 aStandardFormatId;
};
// CDataFormatTranslator // CDataFormatTranslator
class CDataFormatTranslator : public class CDataFormatTranslator : public
...@@ -86,8 +69,6 @@ public: ...@@ -86,8 +69,6 @@ public:
throw(css::uno::RuntimeException); throw(css::uno::RuntimeException);
private: private:
void SAL_CALL initTranslationTable( );
void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, css::datatransfer::DataFlavor& aDataFlavor ) const; void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, css::datatransfer::DataFlavor& aDataFlavor ) const;
void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, css::datatransfer::DataFlavor& aDataFlavor ) const; void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, css::datatransfer::DataFlavor& aDataFlavor ) const;
void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, css::uno::Any& aAny ) const; void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, css::uno::Any& aAny ) const;
...@@ -101,7 +82,6 @@ private: ...@@ -101,7 +82,6 @@ private:
css::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, css::uno::Type dtype ); css::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, css::uno::Type dtype );
private: private:
std::vector< FormatEntry > m_TranslTable;
const css::uno::Reference< css::uno::XComponentContext > m_xContext; const css::uno::Reference< css::uno::XComponentContext > m_xContext;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment