desktop/source/lib/init.cxx | 28 +++++++++++++-------------- include/LibreOfficeKit/LibreOfficeKitEnums.h | 2 - include/svx/flagsdef.hxx | 11 ---------- 3 files changed, 16 insertions(+), 25 deletions(-)
New commits: commit d0f8361289dc6ed88f0ae8074bea34b57d811341 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Aug 30 10:16:14 2016 +0300 Clarify what the error code actually is Based on how LOK_CALLBACK_ERROR callbacks are actually done in desktop/source/lib/lokinteractionhandler.cxx. Change-Id: Ibbe37c681252aa91c979d51b9aae6236ff9d88de diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h index 324318c..8aef838 100644 --- a/include/LibreOfficeKit/LibreOfficeKitEnums.h +++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h @@ -284,7 +284,7 @@ typedef enum * { * "classification": "error" | "warning" | "info" * "kind": "network" etc. - * "code": 403 | 404 | ... + * "code": a structured 32-bit error code, the ErrCode from LibreOffice's <tools/errcode.hxx> * "message": freeform description * } */ commit 7c673d27df5e22d7af981806999cdbbf15866680 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Aug 30 09:51:03 2016 +0300 Bin some noise comments Change-Id: I5815d8fe9a77c04ec73ac105decce3cc154487c5 diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index dd4e915..0207a0e 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -22,9 +22,6 @@ #include <o3tl/typed_flags_set.hxx> #include <o3tl/enumarray.hxx> -// defines --------------------------------------------------------------- - -// copy from border.hxx // Border-Modes for SvxBorderTabPage enum class SwBorderModes { @@ -33,6 +30,7 @@ enum class SwBorderModes TABLE = 0x02, FRAME = 0x04, }; + namespace o3tl { template<> struct typed_flags<SwBorderModes> : is_typed_flags<SwBorderModes, 0x07> {}; @@ -54,7 +52,6 @@ namespace o3tl // flags for SvxBorderTabPage #define SVX_HIDESHADOWCTL 0x01 -// copy from chardlg.hxx #define DISABLE_CASEMAP ((sal_uInt16)0x0001) #define DISABLE_WORDLINE ((sal_uInt16)0x0002) #define DISABLE_BLINK ((sal_uInt16)0x0004) @@ -97,22 +94,17 @@ const o3tl::enumarray<SvxNumValCategory, double> fSvxNumValConst = { 0.0 // SvxNumValCategory::NoValue }; -// copy from page.hxx -// enum ------------------------------------------------------------------ - enum SvxModeType { SVX_PAGE_MODE_STANDARD, SVX_PAGE_MODE_CENTER, SVX_PAGE_MODE_PRESENTATION }; -// define ---------------------------------------------------------------- // 1/2 cm in TWIPS // Is also used for minimum size of LayFrms of any kind #define MM50 283 //from original svx/inc/paragrph.hxx -//--------------from original svx/inc/tabstpge.hxx enum class TabulatorDisableFlags { TypeLeft = 0x0001, TypeRight = 0x0002, @@ -131,7 +123,6 @@ namespace o3tl { template<> struct typed_flags<TabulatorDisableFlags> : is_typed_flags<TabulatorDisableFlags, 0x1ff> {}; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 5d77b738cb397338c95be898bf845bd0be8edc80 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Aug 30 08:58:58 2016 +0300 No reason why these functions can't be static, too Change-Id: I95b68e912c87657a6884f8c56bfcc7bc52c2f2e5 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 79129d7..1de564f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -315,7 +315,7 @@ extern "C" { static void doc_destroy(LibreOfficeKitDocument* pThis); -static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const char* pFormat, const char* pFilterOptions); +static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const char* pFormat, const char* pFilterOptions); static int doc_getDocumentType(LibreOfficeKitDocument* pThis); static int doc_getParts(LibreOfficeKitDocument* pThis); static char* doc_getPartPageRectangles(LibreOfficeKitDocument* pThis); @@ -323,12 +323,12 @@ static int doc_getPart(LibreOfficeKitDocument* pThis); static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart); static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart); static void doc_setPartMode(LibreOfficeKitDocument* pThis, int nPartMode); -void doc_paintTile(LibreOfficeKitDocument* pThis, +static void doc_paintTile(LibreOfficeKitDocument* pThis, unsigned char* pBuffer, const int nCanvasWidth, const int nCanvasHeight, const int nTilePosX, const int nTilePosY, const int nTileWidth, const int nTileHeight); -void doc_paintPartTile(LibreOfficeKitDocument* pThis, +static void doc_paintPartTile(LibreOfficeKitDocument* pThis, unsigned char* pBuffer, const int nPart, const int nCanvasWidth, const int nCanvasHeight, @@ -1235,11 +1235,11 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, } } -void doc_paintTile(LibreOfficeKitDocument* pThis, - unsigned char* pBuffer, - const int nCanvasWidth, const int nCanvasHeight, - const int nTilePosX, const int nTilePosY, - const int nTileWidth, const int nTileHeight) +static void doc_paintTile(LibreOfficeKitDocument* pThis, + unsigned char* pBuffer, + const int nCanvasWidth, const int nCanvasHeight, + const int nTilePosX, const int nTilePosY, + const int nTileWidth, const int nTileHeight) { SAL_INFO( "lok.tiledrendering", "paintTile: painting [" << nTileWidth << "x" << nTileHeight << "]@(" << nTilePosX << ", " << nTilePosY << ") to [" << @@ -1305,12 +1305,12 @@ void doc_paintTile(LibreOfficeKitDocument* pThis, } -void doc_paintPartTile(LibreOfficeKitDocument* pThis, - unsigned char* pBuffer, - const int nPart, - const int nCanvasWidth, const int nCanvasHeight, - const int nTilePosX, const int nTilePosY, - const int nTileWidth, const int nTileHeight) +static void doc_paintPartTile(LibreOfficeKitDocument* pThis, + unsigned char* pBuffer, + const int nPart, + const int nCanvasWidth, const int nCanvasHeight, + const int nTilePosX, const int nTilePosY, + const int nTileWidth, const int nTileHeight) { SAL_INFO( "lok.tiledrendering", "paintPartTile: painting @ " << nPart << " [" << nTileWidth << "x" << nTileHeight << "]@(" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits