vcl/inc/jobset.h | 30 +++++++------- vcl/inc/list.h | 89 ------------------------------------------- vcl/source/fontsubset/list.h | 89 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 104 deletions(-)
New commits: commit d6ccd22db0e8bcdeacdc2f39cbab0d9f79298ef8 Author: Chris Sherlock <[email protected]> Date: Mon Jan 25 21:46:50 2016 +1100 vcl: move vcl/inc/list.h to vcl/source/fontsubset/ This appears to be an implementation of a linked list for processing truetype fonts. I genuinely do NOT want anyone to use this anywhere in the codebase except where it's already being used! If we must use a list, then we can use the standard template library... Thus, I'm moving this closer to the code that uses it - which means moving it directly into the fontsubset directory Change-Id: I67fb324a004cd30e32043bf9d5a3b193351d58c0 diff --git a/vcl/inc/list.h b/vcl/source/fontsubset/list.h similarity index 100% rename from vcl/inc/list.h rename to vcl/source/fontsubset/list.h commit ba0c14333eea94896d1c331a93e8e4bf6537976a Author: Chris Sherlock <[email protected]> Date: Mon Jan 25 21:37:32 2016 +1100 vcl: fix comments to vcl/inc/jobset.h Change-Id: I888032cfcab0a40f9fe8e032fb5514a2bf1d9df6 diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index 721f1b0..5e86d8b 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -31,24 +31,24 @@ struct ImplJobSetup { - sal_uInt16 mnRefCount; // RefCount (only independ data) - sal_uInt16 mnSystem; // System - JOBSETUP_SYSTEM_xxxx - OUString maPrinterName; // Printer-Name - OUString maDriver; // Driver-Name - Orientation meOrientation; // Orientation - DuplexMode meDuplexMode; // Duplex - sal_uInt16 mnPaperBin; // paper bin / in tray - Paper mePaperFormat; // paper format - long mnPaperWidth; // paper width (100th mm) - long mnPaperHeight; // paper height (100th mm) - sal_uInt32 mnDriverDataLen; // length of system specific data - sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block) - bool mbPapersizeFromSetup; - std::unordered_map< OUString, OUString, OUStringHash > maValueMap; - ImplJobSetup(); ImplJobSetup( const ImplJobSetup& rJobSetup ); ~ImplJobSetup(); + + sal_uInt16 mnRefCount; //< RefCount (only independent data) + sal_uInt16 mnSystem; //< System - JOBSETUP_SYSTEM_xxxx + OUString maPrinterName; //< Printer-Name + OUString maDriver; //< Driver-Name + Orientation meOrientation; //< Orientation + DuplexMode meDuplexMode; //< Duplex + sal_uInt16 mnPaperBin; //< paper bin / in tray + Paper mePaperFormat; //< paper format + long mnPaperWidth; //< paper width (100th mm) + long mnPaperHeight; //< paper height (100th mm) + sal_uInt32 mnDriverDataLen; //< length of system specific data + sal_uInt8* mpDriverData; //< system specific data (will be streamed a byte block) + bool mbPapersizeFromSetup; + std::unordered_map< OUString, OUString, OUStringHash > maValueMap; }; // Papierformat wird wenn PAPER_USER im unabhaengigen Teil automatisch aus _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
