sw/Library_sw.mk | 1 sw/inc/swtblfmt.hxx | 48 +++----------------------- sw/source/core/doc/swtblfmt.cxx | 72 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 42 deletions(-)
New commits: commit 6d71db73a4dd814a8d80d00e640d4c1ff3611dbf Author: Alex Ivan <alexni...@yahoo.com> Date: Wed Jun 26 12:51:27 2013 +0300 Move constructors from sw/inc/swtblfmt.hxx Moved the constructors for SwTableFmt and SwTableLineFmt from the header file for clarity. Change-Id: If33d48feefcb712fe745c6d2c87e5bb3aa83d8cc diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 679d60d..c934b7e 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -195,6 +195,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/doc/sortopt \ sw/source/core/doc/swserv \ sw/source/core/doc/swstylemanager \ + sw/source/core/doc/swtblfmt \ sw/source/core/doc/tblafmt \ sw/source/core/doc/tblcpy \ sw/source/core/doc/tblrwcl \ diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 76c6311..2a9d53a 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -31,33 +31,10 @@ class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt protected: SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) - { - pFstLineFmt = NULL; - pLstLineFmt = NULL; - pOddLineFmt = NULL; - pEvnLineFmt = NULL; - - pFstColFmt = NULL; - pLstColFmt = NULL; - pOddColFmt = NULL; - pEvnColFmt = NULL; - } + SwFrmFmt *pDrvdFrm ); + SwTableFmt( SwAttrPool& rPool, const String &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) - { - pFstLineFmt = NULL; - pLstLineFmt = NULL; - pOddLineFmt = NULL; - pEvnLineFmt = NULL; - - pFstColFmt = NULL; - pLstColFmt = NULL; - pOddColFmt = NULL; - pEvnColFmt = NULL; - } + SwFrmFmt *pDrvdFrm ); SwTableLineFmt* pFstLineFmt; SwTableLineFmt* pLstLineFmt; @@ -102,23 +79,10 @@ class SwTableLineFmt : public SwFrmFmt protected: SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) - { - pFstBoxFmt = NULL; - pLstBoxFmt = NULL; - pOddBoxFmt = NULL; - pEvnBoxFmt = NULL; - } + SwFrmFmt *pDrvdFrm ); + SwTableLineFmt( SwAttrPool& rPool, const String &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) - { - pFstBoxFmt = NULL; - pLstBoxFmt = NULL; - pOddBoxFmt = NULL; - pEvnBoxFmt = NULL; - } + SwFrmFmt *pDrvdFrm ); // Odd and Even Box formats will be used to handle alternating columns SwTableBoxFmt* pFstBoxFmt; diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx new file mode 100644 index 0000000..b3cd7ff --- /dev/null +++ b/sw/source/core/doc/swtblfmt.cxx @@ -0,0 +1,72 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <swtblfmt.hxx> + +SwTableFmt::SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, + SwFrmFmt *pDrvdFrm ) + : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) + { + pFstLineFmt = NULL; + pLstLineFmt = NULL; + pOddLineFmt = NULL; + pEvnLineFmt = NULL; + + pFstColFmt = NULL; + pLstColFmt = NULL; + pOddColFmt = NULL; + pEvnColFmt = NULL; + } + +SwTableFmt::SwTableFmt( SwAttrPool& rPool, const String &rFmtNm, + SwFrmFmt *pDrvdFrm ) + : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) + { + pFstLineFmt = NULL; + pLstLineFmt = NULL; + pOddLineFmt = NULL; + pEvnLineFmt = NULL; + + pFstColFmt = NULL; + pLstColFmt = NULL; + pOddColFmt = NULL; + pEvnColFmt = NULL; + } + +SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, + SwFrmFmt *pDrvdFrm ) + : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) + { + pFstBoxFmt = NULL; + pLstBoxFmt = NULL; + pOddBoxFmt = NULL; + pEvnBoxFmt = NULL; + } + +SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const String &rFmtNm, + SwFrmFmt *pDrvdFrm ) + : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) + { + pFstBoxFmt = NULL; + pLstBoxFmt = NULL; + pOddBoxFmt = NULL; + pEvnBoxFmt = NULL; + } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits