extensions/source/plugin/aqua/sysplug.mm | 10 +++++----- sd/source/ui/sidebar/MasterPageContainer.cxx | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-)
New commits: commit 074b29c368720d6552bb5a29e1aae4b8728a7549 Author: Tor Lillqvist <[email protected]> Date: Thu Sep 19 12:37:15 2013 +0300 WaE: private field 'mbPageRatioKnown' is not used Change-Id: Id9efce7b1308a022db14865cf9fbee33ff939e34 diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 906f880..3853771 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -166,7 +166,6 @@ private: Size maSmallPreviewSizePixel; Size maLargePreviewSizePixel; - bool mbPageRatioKnown; bool mbContainerCleaningPending; @@ -594,7 +593,6 @@ MasterPageContainer::Implementation::Implementation (void) maChangeListeners(), maSmallPreviewSizePixel(), maLargePreviewSizePixel(), - mbPageRatioKnown(false), mbContainerCleaningPending(true) { commit b432c08206c2b3da93c502ec458668d675d2839f Author: Tor Lillqvist <[email protected]> Date: Thu Sep 19 11:57:04 2013 +0300 WaE: cast to 'void *' from smaller integer type Change-Id: I85d4a4c3c7bf708daa85dbe7f3af54311c4d7e2e diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 371ad7d..366c8d5 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -625,7 +625,7 @@ NPError MacPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro m_eCall = eNPP_DestroyStream; m_aArgs[0] = (void*)instance; m_aArgs[1] = (void*)stream; - m_aArgs[2] = (void*)reason; + m_aArgs[2] = (void*)(intptr_t)reason; return (NPError)execute(); } @@ -650,8 +650,8 @@ NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mo m_eCall = eNPP_New; m_aArgs[0] = (void*)pluginType; m_aArgs[1] = (void*)instance; - m_aArgs[2] = (void*)mode; - m_aArgs[3] = (void*)argc; + m_aArgs[2] = (void*)(intptr_t)mode; + m_aArgs[3] = (void*)(intptr_t)argc; m_aArgs[4] = (void*)argn; m_aArgs[5] = (void*)argv; m_aArgs[6] = (void*)saved; @@ -668,7 +668,7 @@ NPError MacPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* s m_aArgs[0] = (void*)instance; m_aArgs[1] = (void*)type; m_aArgs[2] = (void*)stream; - m_aArgs[3] = (void*)seekable; + m_aArgs[3] = (void*)(intptr_t)seekable; m_aArgs[4] = (void*)stype; return (NPError)execute(); } @@ -721,7 +721,7 @@ void MacPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reaso m_eCall = eNPP_URLNotify; m_aArgs[0] = (void*)instance; m_aArgs[1] = (void*)url; - m_aArgs[2] = (void*)reason; + m_aArgs[2] = (void*)(intptr_t)reason; m_aArgs[3] = notifyData; execute(); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
