summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli_ure/source/native/makefile.mk1
-rw-r--r--cli_ure/version/makefile.mk14
-rwxr-xr-xcppuhelper/test/testlib/makefile.mk4
-rw-r--r--jvmfwk/source/makefile.mk3
-rw-r--r--offapi/util/makefile.mk2
-rw-r--r--pyuno/demo/makefile.mk185
-rw-r--r--sal/osl/all/makefile.mk8
-rw-r--r--sal/osl/unx/makefile.mk4
-rw-r--r--sal/qa/osl/process/makefile.mk14
-rw-r--r--sal/qa/rtl/bootstrap/makefile.mk14
-rw-r--r--sal/qa/rtl/process/makefile.mk17
-rw-r--r--sal/rtl/source/makefile.mk1
-rwxr-xr-xsal/systools/win32/onlineupdate/makefile.mk3
-rw-r--r--sal/systools/win32/uwinapi/makefile.mk1
-rw-r--r--sal/test/unloading/makefile.mk9
-rw-r--r--sal/util/makefile.mk8
-rw-r--r--salhelper/test/Symbols/makefile.mk2
-rw-r--r--salhelper/test/dynamicloader/makefile.mk8
-rw-r--r--stoc/test/javavm/makefile.mk6
-rw-r--r--stoc/test/makefile.mk4
20 files changed, 6 insertions, 302 deletions
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 2c8be1a9b5b9..d0b87e6f6817 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -25,7 +25,6 @@
#
# ************************************************************************/
-
PRJ = ..$/..
PRJNAME = cli_ure
diff --git a/cli_ure/version/makefile.mk b/cli_ure/version/makefile.mk
index 2b5913100be4..4f84cab0e6dc 100644
--- a/cli_ure/version/makefile.mk
+++ b/cli_ure/version/makefile.mk
@@ -40,21 +40,7 @@ TARGET = cliureversion.mk
ALLTAR : \
$(BIN)$/cliureversion.mk
-# INCVERSION
-
#always deliver a cliureversion.mk. It is needed for the packing process even for all other
#platforms. Therefore BUILD_FOR_CLI is not used here
$(BIN)$/cliureversion.mk: version.txt
$(GNUCOPY) $< $@
-
-
-#disabled because of #67482
-#Create the config file that is used with the policy assembly
-#only if new published types have been added, the cliureversion.mk is written.
-#INCVERSION .PHONY: version.txt incversions.txt
-# $(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
-# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-
-
-
diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
index edaba0c6532c..b53f6ebab71b 100755
--- a/cppuhelper/test/testlib/makefile.mk
+++ b/cppuhelper/test/testlib/makefile.mk
@@ -24,6 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
+
LINKFLAGSDEFS=""
PRJ=..$/..
@@ -56,9 +57,6 @@ LIB!:=$(LIB);$(PERLLIBS)
# --- Files --------------------------------------------------------
-#CFLAGS += -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -fPIC -I/develop6/update/dev/solenv/unxlngi3/lib/perl5/5.6.0/i686-linux/CORE/
-#CFLAGS += -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -KPIC -I/develop6/update/dev/solenv/unxsols2/lib/perl5/5.6.0/sun4-solaris/CORE
-
SLOFILES= $(SLO)$/defbootstrap_lib.obj
SHL1TARGET=$(TARGET)
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
index 22056983dd1d..d43a31bc642d 100644
--- a/jvmfwk/source/makefile.mk
+++ b/jvmfwk/source/makefile.mk
@@ -51,15 +51,12 @@ SLOFILES = \
$(SLO)$/fwkbase.obj
-#LIB1TARGET=$(SLB)$/$(FRAMEWORKLIB).lib
-
.IF "$(UNIXVERSIONNAMES)" == ""
SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR)
.ELSE # UNIXVERSIONNAMES
SHL1TARGET = $(FRAMEWORKLIB)
.ENDIF # UNIXVERSIONNAMES
-#SHL1TARGET=$(FRAMEWORKLIB)
SHL1DEPN=
SHL1IMPLIB = i$(FRAMEWORKLIB)
SHL1LIBS = $(SLB)$/$(TARGET).lib
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 2518876ca4d1..fedb64480369 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -31,12 +31,12 @@ PRJPCH=
PRJNAME=offapi
TARGET=offapi_db
-
# --- Settings -----------------------------------------------------
.INCLUDE : makefile.pmk
# ------------------------------------------------------------------
+
UNOIDLDBFILES= \
$(UCR)$/cssauth.db \
$(UCR)$/cssawt.db \
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk
index f328ac5a6ddc..7911048f8b0e 100644
--- a/pyuno/demo/makefile.mk
+++ b/pyuno/demo/makefile.mk
@@ -42,188 +42,3 @@ $(ROOT)$/samples$/% : %
$(ROOT)$/% : ..$/doc$/%
-rm -f $@
cat $? > $@
-
-#VERSION=0.9.4
-#PYDIRNAME=python-$(PYVERSION)
-#.IF "$(GUI)"=="WNT"
-#INISUFFIX=.ini
-#BATCHSUFFIX=.bat
-#ENVSUFFIX=.bat
-#PLATFORM=win32
-#EXESUFFIX=.exe
-#PACKSUFFIX=.zip
-#MYCOPY=copy
-#DOLLAR_SIGN=$$
-#.ELSE
-#DOLLAR_SIGN=\$$
-#PACKSUFFIX=.tar.gz
-#MYCOPY=cp
-#BATCHSUFFIX=.sh
-#ENVSUFFIX=.tcsh
-#INISUFFIX=rc
-#PYUNOMODULE=$(DESTROOT)$/program$/pyuno$(DLLPOST)
-#PYTHONLIBRARY=$(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
-#PYRUNTIMELINK=$(DESTROOT)$/program$/python
-#PYRUNTIMELIBLINK1=$(DESTROOT)$/program$/libpython.so.2
-#PYRUNTIMELIBLINK2=$(DESTROOT)$/program$/libpython.so
-#
-#.IF "$(OS)$(CPU)"=="SOLARISS"
-#PLATFORM=solaris-sparc
-#.ELIF "$(OS)$(CPU)"=="SOLARISI"
-#PLATFORM=solaris-x86
-#.ELIF "$(OS)$(CPU)"=="LINUXI"
-#PLATFORM=linux-x86
-#.ELIF "$(OS)$(CPU)"=="LINUXP"
-#PLATFORM=linux-ppc
-#.ELSE
-#error please add your platform
-#.ENDIF
-#
-#.ENDIF
-#
-#DESTROOT=$(BIN)$/root
-#
-#FINDDIRS=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type d))
-#FINDLIBFILES=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type f))
-#
-#PYRUNTIME_DIRS=\
-# $(DESTROOT) \
-# $(DESTROOT)$/program \
-# $(DESTROOT)$/program/pydemo \
-# $(DESTROOT)$/program$/$(PYDIRNAME) \
-# $(DESTROOT)$/program$/$(PYDIRNAME)$/bin \
-# $(DESTROOT)$/program$/$(PYDIRNAME)$/lib \
-# $(foreach,i,$(FINDDIRS) $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/$(i))
-#
-#
-#FILES=\
-# $(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) \
-# $(DESTROOT)$/program$/pythonloader.uno$(DLLPOST) \
-# $(DESTROOT)$/program$/pyuno$(INISUFFIX) \
-# $(DESTROOT)$/program$/uno.py \
-# $(DESTROOT)$/program$/unohelper.py \
-# $(DESTROOT)$/program$/pythonloader.py \
-# $(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX) \
-# $(DESTROOT)$/program$/regcomp$(EXESUFFIX) \
-# $(DESTROOT)$/program$/pyunoenv$(ENVSUFFIX) \
-# $(DESTROOT)$/program$/pydemo$/biblioaccess.py \
-# $(DESTROOT)$/program$/pydemo$/ooextract.py \
-# $(DESTROOT)$/program$/pydemo$/swriter.py \
-# $(DESTROOT)$/program$/pydemo$/swritercomp.py \
-# $(DESTROOT)$/program$/pydemo$/swritercompclient.py \
-# $(DESTROOT)$/program$/pydemo$/swritercompclient.py \
-# $(DESTROOT)$/program$/pydemo$/python-bridge.html \
-# $(PYUNOMODULE) \
-# $(PYTHONLIBRARY) \
-# $(DESTROOT)$/program$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX) \
-# $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/$(i)) \
-# $(PYRUNTIMELINK) \
-# $(PYRUNTIMELIBLINK1) \
-# $(PYRUNTIMELIBLINK2)
-#
-#
-#
-#$(BIN)$/pyuno-$(PLATFORM)-$(PYVERSION)$(PACKSUFFIX) : makefile.mk dirs $(FILES)
-# -rm $@
-#.IF "$(GUI)"=="WNT"
-# +cd $(DESTROOT) && zip -r ..$/pyuno-$(PLATFORM)-$(VERSION)$(PACKSUFFIX) program
-#.ELSE
-# $(FIND) $(DESTROOT) -name '*.so' | xargs strip
-# cd $(DESTROOT) && tar -cO program | gzip - > ..$/pyuno-$(PLATFORM)-$(VERSION)$(PACKSUFFIX)
-#.ENDIF
-#
-#
-#dirs .PHONY:
-# -mkdir $(PYRUNTIME_DIRS)
-#
-## Some symbolic links for unix
-#.IF "$(GUI)" == "UNX"
-#$(PYRUNTIMELINK) : makefile.mk
-# -rm -f $@
-# cd $(DESTROOT)$/program && ln -s $(PYDIRNAME) python
-#
-#$(PYRUNTIMELIBLINK1) : makefile.mk
-# -rm -f $@
-# cd $(DESTROOT)$/program && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST).$(PYMAJOR)
-#
-#$(PYRUNTIMELIBLINK2) : makefile.mk
-# -rm -f $@
-# cd $(DESTROOT)$/program && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
-#.ENDIF
-#
-#$(DESTROOT)$/program$/regcomp$(EXESUFFIX) : $(SOLARBINDIR)$/regcomp$(EXESUFFIX)
-# cp $? $@
-#.IF "$(GUI)" == "UNX"
-# strip $@
-# chmod +x $@
-#.ENDIF
-#
-#
-#$(DESTROOT)$/program$/pyunoenv$(ENVSUFFIX) : pyunoenv$(ENVSUFFIX)
-# -rm -f $@
-# cat $? > $@
-#
-#$(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) : $(DLLDEST)$/$(DLLPRE)pyuno$(DLLPOST)
-# cp $? $@
-#
-#$(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX) : makefile.mk
-# -rm -f $@
-#.IF "$(GUI)"!="WNT"
-# echo #\!/bin/sh >> $@
-# chmod +x $@
-#.ENDIF
-# echo regcomp -register -r services.rdb -c pythonloader.uno >>$@
-## echo "$(MYCOPY) applicat.rdb pydemo$/applicat.rdb" >> $@
-# echo regcomp -register -br types.rdb -br services.rdb -r services.rdb -c vnd.openoffice.pymodule:swritercomp -l com.sun.star.loader.Python >>$@
-#
-#$(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION) : $(SOLARLIBDIR)$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
-# cp $? $@
-#
-#$(DESTROOT)$/program$/pythonloader.uno$(DLLPOST) : $(DLLDEST)$/pythonloader.uno$(DLLPOST)
-# cp $? $@
-#
-#$(DESTROOT)$/program$/%.py : $(DLLDEST)$/%.py
-# cp $? $@
-#
-#.IF "$(GUI)" == "UNX"
-#$(DESTROOT)$/program$/pyuno$(DLLPOST) : $(DLLDEST)$/pyuno$(DLLPOST)
-# cp $? $@
-#.ENDIF
-#
-#$(DESTROOT)$/program$/pydemo$/%.py : %.py
-# -rm -f $@
-# cat $? > $@
-#
-#$(DESTROOT)$/program$/pyuno$(INISUFFIX) : makefile.mk
-# -rm -f $@ $(DESTROOT)$/program$/pyuno.tmp
-# echo UNO_TYPES=$(DOLLAR_SIGN)PYUNOLIBDIR/types.rdb > $(DESTROOT)$/program$/pyuno.tmp
-# echo UNO_SERVICES=$(DOLLAR_SIGN)PYUNOLIBDIR/services.rdb >> $(DESTROOT)$/program$/pyuno.tmp
-# mv $(DESTROOT)$/program$/pyuno.tmp $@
-#
-#$(DESTROOT)$/program$/pydemo$/python-bridge.html : ..$/doc$/python-bridge.html
-# -rm -f $@
-# cat $? > $@
-#
-#
-# $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/%.so : $(SOLARLIBDIR)$/python$/%.so
-# -rm -f $@
-# cat $? > $@
-# strip $@
-#
-#$(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/% : $(SOLARLIBDIR)$/python$/%
-# -rm -f $@
-# cat $? > $@
-#
-#
-#$(DESTROOT)$/program$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX) : $(SOLARBINDIR)$/python$(EXESUFFIX)
-# -rm -f $@
-# cat $? > $@
-#.IF "$(GUI)" == "UNX"
-# strip $@
-# chmod +x $@
-#.ENDIF
-#
-#
-#
-#
-# \ No newline at end of file
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index 0d105906effb..84edd954dc48 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -57,20 +57,12 @@ SLOFILES= \
$(SLO)$/debugbase.obj\
$(SLO)$/loadmodulerelative.obj
-# $(SLO)$/readline.obj\
-
-#.IF "$(UPDATER)"=="YES"
OBJFILES= \
$(OBJ)$/utility.obj\
$(OBJ)$/filepath.obj\
$(OBJ)$/debugbase.obj\
$(OBJ)$/loadmodulerelative.obj
-# $(OBJ)$/readline.obj\
-#.ENDIF
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
-
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 8c27831db580..117609a38d40 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -41,7 +41,6 @@ PROJECTPCHSOURCE=cont_pch
TARGETTYPE=CUI
-
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -81,8 +80,6 @@ SLOFILES= \
$(SLO)$/process_impl.obj\
$(SLO)$/salinit.obj
-
-#.IF "$(UPDATER)"=="YES"
OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/diagnose.obj \
$(OBJ)$/semaphor.obj \
@@ -112,7 +109,6 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/process_impl.obj\
$(OBJ)$/salinit.obj
-#.ENDIF
.IF "$(OS)"=="MACOSX"
SLOFILES += $(SLO)$/osxlocale.obj
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index 6bbee03b6aaf..2bcbe481ce06 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -55,17 +55,12 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
DEF1NAME =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
-#.IF "$(GUI)" == "WNT"
-
SHL2OBJS=$(SLO)$/osl_process.obj
SHL2TARGET=osl_process
SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
@@ -80,17 +75,8 @@ DEF2EXPORTFILE=export.exp
OBJ3FILES=$(OBJ)$/osl_process_child.obj
APP3TARGET=osl_process_child
APP3OBJS=$(OBJ3FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP3STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP3STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
APP3STDLIBS=$(SALLIB)
-#.ENDIF # "$(GUI)" == "WNT"
-
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk
index d32f9db35383..1cf981583c67 100644
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -38,11 +38,9 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(GUI)"=="WNT"
-#BOOTSTRAPSCRIPT=bootstrap.bat
BOOTSTRAPINI=testshl2.ini
MY_SCRIPTCAT=cat
.ELSE
-#BOOTSTRAPSCRIPT=bootstrap
BOOTSTRAPINI=testshl2rc
MY_SCRIPTCAT=tr -d "\015" <
.ENDIF
@@ -61,27 +59,15 @@ SHL1TARGET= rtl_Bootstrap
SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
OBJ2FILES=$(OBJ)$/bootstrap_process.obj
APP2TARGET=bootstrap_process
APP2OBJS=$(OBJ2FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP2STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP2STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
APP2STDLIBS=$(SALLIB)
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk
index 5df9dc01504e..81fc0b66e071 100644
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -51,35 +51,19 @@ SHL1TARGET= rtl_Process
SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
OBJ3FILES=$(OBJ)$/child_process.obj
APP3TARGET=child_process
APP3OBJS=$(OBJ3FILES)
-
-#.IF "$(GUI)" == "UNX"
-#APP3STDLIBS=$(LB)$/libsal.so
-#.ENDIF
-#.IF "$(GUI)" == "WNT"
-#APP3STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-#.ENDIF
APP3STDLIBS=$(SALLIB)
OBJ4FILES=$(OBJ)$/child_process_id.obj
APP4TARGET=child_process_id
APP4OBJS=$(OBJ4FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP4STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP4STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
APP4STDLIBS=$(SALLIB)
#------------------------------- All object files -------------------------------
@@ -90,4 +74,3 @@ SLOFILES=$(SHL1OBJS)
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
-
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index b8f40170693b..3121f184ba8b 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -102,7 +102,6 @@ SLOFILES+=$(SLO)$/memory_fini.obj
.ENDIF
-#.IF "$(UPDATER)"=="YES"
OBJFILES= \
$(OBJ)$/memory.obj \
$(OBJ)$/cipher.obj \
diff --git a/sal/systools/win32/onlineupdate/makefile.mk b/sal/systools/win32/onlineupdate/makefile.mk
index fbf69a0c6c27..027ddef11192 100755
--- a/sal/systools/win32/onlineupdate/makefile.mk
+++ b/sal/systools/win32/onlineupdate/makefile.mk
@@ -66,9 +66,6 @@ DEF1DEPN=\
SHL1OBJS=$(SLOFILES)
-#No default libraries
-#STDSHL=
-
SHL1STDLIBS=\
$(KERNEL32LIB)\
$(LIBCMT)\
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index b086228b68d9..1d7e7580cb45 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -121,7 +121,6 @@ DEF1DEPN=\
$(DEF1EXPORTFILE)\
makefile.mk
-#SHL1VERINFO=$(SHL1TARGET).rc
SHL1OBJS=$(SLOFILES)
#No default libraries
diff --git a/sal/test/unloading/makefile.mk b/sal/test/unloading/makefile.mk
index 6c6f6f74f058..24800ef156db 100644
--- a/sal/test/unloading/makefile.mk
+++ b/sal/test/unloading/makefile.mk
@@ -30,7 +30,6 @@ PRJNAME= sal
TARGET= unloading
TARGET1=samplelib1
TARGET2=samplelib2
-#LIBTARGET=NO
TARGETTYPE=CUI
COMP1TYPELIST=$(TARGET1)
@@ -65,10 +64,6 @@ INCPRE+= $(OUT)$/inc$/light
.ENDIF
-#SLOFILES= \
-# $(SLO)$/samplelib1.obj \
-# $(SLO)$/samplelib2.obj
-
LIB1TARGET=$(SLB)$/$(TARGET1).lib
LIB1OBJFILES= \
$(SLO)$/samplelib1.obj
@@ -80,14 +75,12 @@ SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(SALLIB)
-
-
SHL1DEPN=
-#SHL1IMPLIB= i$(TARGET1)
SHL1LIBS= $(SLB)$/$(TARGET1).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1EXPORTFILE= exports.dxp
DEF1NAME= $(SHL1TARGET)
+
#-------------------------------------------------------
LIB2TARGET=$(SLB)$/$(TARGET2).lib
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 1eab39a565fc..4e1086823f1f 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -66,11 +66,6 @@ LIB1FILES= \
$(SLB)$/cpprtl.lib \
$(SLB)$/textenc.lib
-#.IF "$(GUI)"=="UNX"
-#LIB1FILES+=$(SLB)$/systoolsunx.lib
-#.ENDIF # UNX
-
-
LIB3TARGET=$(LB)$/a$(TARGET).lib
LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
LIB3FILES= \
@@ -79,9 +74,6 @@ LIB3FILES= \
$(LB)$/cpprtl.lib \
$(LB)$/textenc.lib
-#.IF "$(GUI)"=="UNX"
-#LIB3FILES+=$(LB)$/systoolsunx.lib
-#.ENDIF # UNX
.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
SHL1TARGET= $(TARGET)
diff --git a/salhelper/test/Symbols/makefile.mk b/salhelper/test/Symbols/makefile.mk
index d6026a3c893b..e91066670601 100644
--- a/salhelper/test/Symbols/makefile.mk
+++ b/salhelper/test/Symbols/makefile.mk
@@ -72,8 +72,6 @@ DEF1NAME= $(SHL1TARGET)
DEFLIB1NAME= $(TARGET1)
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
-#DEF1EXPORTFILE= exports.dxp
-
# ------------------------------------------------------------------------------
OBJFILES= $(OBJ)$/loader.obj
diff --git a/salhelper/test/dynamicloader/makefile.mk b/salhelper/test/dynamicloader/makefile.mk
index 718f9cbe6bbc..d786692cb551 100644
--- a/salhelper/test/dynamicloader/makefile.mk
+++ b/salhelper/test/dynamicloader/makefile.mk
@@ -43,14 +43,11 @@ BOOTSTRAP_SERVICE=FALSE
# --- Files ---
-
#RTTI on
.IF "$(OS)" == "WNT"
CFLAGS+= -GR
.ENDIF
-
-# UNOTYPES= com.sun.star.lang.XInitialization \
#---------------------------------------------------------------------------
# Build the test library which is loaded by the
# RealDynamicLoader
@@ -79,8 +76,6 @@ DEF1NAME= $(SHL1TARGET)
DEFLIB1NAME =$(TARGET1)
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
-#DEF1EXPORTFILE= exports.dxp
-
# ------------------------------------------------------------------------------
APP1NOSAL=TRUE
@@ -94,8 +89,6 @@ APP1STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB)
-#APP1LIBS= $(LB)$/isalhelper.lib
-
.IF "$(OS)" == "WNT"
APP1STDLIBS+= $(LB)$/isalhelper.lib
.ELSE
@@ -114,4 +107,3 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo Making: $@
@echo __CT>>$@
-
diff --git a/stoc/test/javavm/makefile.mk b/stoc/test/javavm/makefile.mk
index 7f6190fecc4f..4998b0a64a73 100644
--- a/stoc/test/javavm/makefile.mk
+++ b/stoc/test/javavm/makefile.mk
@@ -35,14 +35,11 @@ NO_BSYMBOLIC= TRUE
UNOUCRDEP= $(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB= $(SOLARBINDIR)$/udkapi.rdb
-#UNOUCROUT= $(OUT)$/inc$/test
UNOUCROUT= $(OUT)$/inc$
-#INCPRE+= $(OUT)$/inc$/test
INCPRE+= $(OUT)$/inc$
-
-
# --- Settings -----------------------------------------------------
+
.INCLUDE : settings.mk
# --- Application 6 - testjavavm ------------------------------------
@@ -65,7 +62,6 @@ APP6STDLIBS= \
$(CPPUHELPERLIB) \
$(SALHELPERLIB) \
$(SALLIB)
-# $(UNOLIB)
# --- Target ------------------------------------------------
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk
index a7b18d062f8b..2f24634da5a0 100644
--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -24,6 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
+
PRJ=..
PRJNAME=stoc
@@ -38,7 +39,7 @@ TARGET7=testconv
TARGET8=testproxyfac
TARGET9=testsmgr2
TARGETTYPE=CUI
-#LIBTARGET=NO
+
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
@@ -59,7 +60,6 @@ SHL1STDLIBS= \
SHL1TARGET=testsmgr_component
SHL1DEPN=
SHL1IMPLIB=i$(SHL1TARGET)
-#SHL1LIBS=$(SLB)$/$(SHL1TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
SHL1VERSIONMAP=testsmgr_cpnt.map
generated by cgit (git 2.34.1) at 2024-07-29 02:27:46 +0000
f0bc..ddfe008381b5 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -132,9 +132,9 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
}
}
- sal_Bool bProvideDTD = sal_False;
- sal_Bool bAcceptNonemptyVersion = sal_False;
- sal_Bool bStoreStartKeyGeneration = sal_False;
+ bool bProvideDTD = false;
+ bool bAcceptNonemptyVersion = false;
+ bool bStoreStartKeyGeneration = false;
if ( !aDocMediaType.isEmpty() )
{
if ( aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII
@@ -158,11 +158,11 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
pRootAttrList->AddAttribute ( ATTRIBUTE_XMLNS,
sCdataAttribute,
MANIFEST_OASIS_NAMESPACE );
- bAcceptNonemptyVersion = sal_True;
+ bAcceptNonemptyVersion = true;
if ( aDocVersion.compareTo( ODFVER_012_TEXT ) >= 0 )
{
// this is ODF12 generation, let encrypted streams contain start-key-generation entry
- bStoreStartKeyGeneration = sal_True;
+ bStoreStartKeyGeneration = true;
pRootAttrList->AddAttribute ( sVersionAttribute, sCdataAttribute, aDocVersion );
}
}
@@ -174,7 +174,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
sCdataAttribute,
MANIFEST_NAMESPACE );
- bProvideDTD = sal_True;
+ bProvideDTD = true;
}
}
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index c20bb1eaa008..6c2511534686 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star;
using namespace std;
ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
-: bIgnoreEncryptData ( sal_False )
+: bIgnoreEncryptData ( false )
, nDerivedKeySize( 0 )
, rManVector ( rNewManVector )
@@ -152,7 +152,7 @@ void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs)
aSequence[PKG_MNFST_DIGESTALG].Value <<= xml::crypto::DigestID::SHA256_1K;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
if ( !bIgnoreEncryptData )
{
@@ -198,7 +198,7 @@ void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs)
nDerivedKeySize = 16;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
if ( !bIgnoreEncryptData )
{
@@ -245,7 +245,7 @@ void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
aSequence[PKG_MNFST_DERKEYSIZE].Value <<= nDerivedKeySize;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
}
}
@@ -264,7 +264,7 @@ void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs)
aSequence[PKG_MNFST_STARTALG].Value <<= xml::crypto::DigestID::SHA1;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
}
void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
@@ -349,7 +349,7 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName )
aSequence.erase(std::remove_if(aSequence.begin(), aSequence.end(),
isEmpty), aSequence.end());
- bIgnoreEncryptData = sal_False;
+ bIgnoreEncryptData = false;
rManVector.push_back ( aSequence.getAsConstList() );
aSequence.clear();
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 55e80df9d6fa..4f2815d9bc34 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -57,7 +57,7 @@ class ManifestImport : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::
protected:
comphelper::SequenceAsVector< com::sun::star::beans::PropertyValue > aSequence;
ManifestStack aStack;
- sal_Bool bIgnoreEncryptData;
+ bool bIgnoreEncryptData;
sal_Int32 nDerivedKeySize;
::std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rManVector;
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 0165d0acf872..bf6b186d9838 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -36,7 +36,7 @@ OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl,
, m_xStream( xStream )
, m_pInterfaceContainer( NULL )
, m_aProperties( aProps )
-, m_bDisposed( sal_False )
+, m_bDisposed( false )
, m_nStorageType( nStorageType )
{
OSL_ENSURE( m_pImpl->m_rMutexRef.Is(), "No mutex is provided!\n" );
@@ -54,7 +54,7 @@ OInputCompStream::OInputCompStream( uno::Reference < io::XInputStream > xStream,
, m_xStream( xStream )
, m_pInterfaceContainer( NULL )
, m_aProperties( aProps )
-, m_bDisposed( sal_False )
+, m_bDisposed( false )
, m_nStorageType( nStorageType )
{
OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
@@ -258,7 +258,7 @@ void OInputCompStream::InternalDispose()
{}
m_pImpl = NULL;
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
void SAL_CALL OInputCompStream::dispose( )
@@ -285,7 +285,7 @@ void SAL_CALL OInputCompStream::dispose( )
m_pImpl = NULL;
}
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index c8db28a58cc3..bbc5b26d4f5d 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -50,7 +50,7 @@ protected:
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > m_aProperties;
- sal_Bool m_bDisposed;
+ bool m_bDisposed;
sal_Int32 m_nStorageType;
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index 0a3f926cc613..1ba6d913294c 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -125,7 +125,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
}
else
{
- sal_Bool bNewElement = sal_False;
+ bool bNewElement = false;
::rtl::Reference< OHierarchyElement_Impl > aElement;
OHierarchyElementList_Impl::iterator aIter = m_aChildren.find( aNextName );
if ( aIter != m_aChildren.end() )
@@ -133,7 +133,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
if ( !aElement.is() )
{
- bNewElement = sal_True;
+ bNewElement = true;
uno::Reference< embed::XStorage > xChildStorage = xOwnStor->openStorageElement( aNextName, nStorageMode );
if ( !xChildStorage.is() )
throw uno::RuntimeException();
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 1eb76a6f5eb8..75aa3477c7b9 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -37,7 +37,7 @@ struct OHierarchyElement_Impl;
struct eqFunc
{
- sal_Bool operator()( const OUString &r1,
+ bool operator()( const OUString &r1,
const OUString &r2) const
{
return r1 == r2;
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 272307f909a3..c4b49cb22cd3 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -181,19 +181,19 @@ bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const
return true;
}
-sal_Bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
+bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
{
if ( !xContext.is() )
- return sal_False;
+ return false;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
uno::Reference < ucb::XSimpleFileAccess3 > xAccess( ucb::SimpleFileAccess::create( xContext ) );
xAccess->kill( aURL );
- bRet = sal_True;
+ bRet = true;
}
catch( const uno::Exception& rException )
{
@@ -242,25 +242,25 @@ OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent,
const uno::Reference< packages::XDataSinkEncrSupport >& xPackageStream,
const uno::Reference< lang::XSingleServiceFactory >& xPackage,
const uno::Reference< uno::XComponentContext >& xContext,
- sal_Bool bForceEncrypted,
+ bool bForceEncrypted,
sal_Int32 nStorageType,
- sal_Bool bDefaultCompress,
+ bool bDefaultCompress,
const uno::Reference< io::XInputStream >& xRelInfoStream )
: m_pAntiImpl( NULL )
-, m_bHasDataToFlush( sal_False )
-, m_bFlushed( sal_False )
+, m_bHasDataToFlush( false )
+, m_bFlushed( false )
, m_xPackageStream( xPackageStream )
, m_xContext( xContext )
, m_pParent( pParent )
, m_bForceEncrypted( bForceEncrypted )
, m_bUseCommonEncryption( !bForceEncrypted && nStorageType == embed::StorageFormats::PACKAGE )
-, m_bHasCachedEncryptionData( sal_False )
+, m_bHasCachedEncryptionData( false )
, m_bCompressedSetExplicit( !bDefaultCompress )
, m_xPackage( xPackage )
-, m_bHasInsertedStreamOptimization( sal_False )
+, m_bHasInsertedStreamOptimization( false )
, m_nStorageType( nStorageType )
, m_xOrigRelInfoStream( xRelInfoStream )
-, m_bOrigRelInfoBroken( sal_False )
+, m_bOrigRelInfoBroken( false )
, m_nRelInfoStatus( RELINFO_NO_INIT )
, m_nRelId( 1 )
{
@@ -345,25 +345,25 @@ void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName,
xParentPackageFolder->insertByName( aName, uno::makeAny( xTunnel ) );
- m_bFlushed = sal_False;
- m_bHasInsertedStreamOptimization = sal_False;
+ m_bFlushed = false;
+ m_bHasInsertedStreamOptimization = false;
}
}
-sal_Bool OWriteStream_Impl::IsEncrypted()
+bool OWriteStream_Impl::IsEncrypted()
{
if ( m_nStorageType != embed::StorageFormats::PACKAGE )
- return sal_False;
+ return false;
if ( m_bForceEncrypted || m_bHasCachedEncryptionData )
- return sal_True;
+ return true;
if ( !m_aTempURL.isEmpty() || m_xCacheStream.is() )
- return sal_False;
+ return false;
GetStreamProperties();
// the following value can not be cached since it can change after root commit
- sal_Bool bWasEncr = sal_False;
+ bool bWasEncr = false;
uno::Reference< beans::XPropertySet > xPropSet( m_xPackageStream, uno::UNO_QUERY );
if ( xPropSet.is() )
{
@@ -374,7 +374,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
}
}
- sal_Bool bToBeEncr = sal_False;
+ bool bToBeEncr = false;
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
if ( m_aProps[nInd].Name == "Encrypted" )
@@ -401,8 +401,8 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
if ( !bWasEncr && bToBeEncr && !aKey.getLength() )
{
// the stream is intended to use common storage password
- m_bUseCommonEncryption = sal_True;
- return sal_False;
+ m_bUseCommonEncryption = true;
+ return false;
}
else
return bToBeEncr;
@@ -418,11 +418,11 @@ void OWriteStream_Impl::SetDecrypted()
// let the stream be modified
FillTempGetFileName();
- m_bHasDataToFlush = sal_True;
+ m_bHasDataToFlush = true;
// remove encryption
- m_bForceEncrypted = sal_False;
- m_bHasCachedEncryptionData = sal_False;
+ m_bForceEncrypted = false;
+ m_bHasCachedEncryptionData = false;
m_aEncryptionData.clear();
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
@@ -445,7 +445,7 @@ void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEn
// let the stream be modified
FillTempGetFileName();
- m_bHasDataToFlush = sal_True;
+ m_bHasDataToFlush = true;
// introduce encryption info
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
@@ -454,9 +454,9 @@ void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEn
m_aProps[nInd].Value <<= sal_True;
}
- m_bUseCommonEncryption = sal_False; // very important to set it to false
+ m_bUseCommonEncryption = false; // very important to set it to false
- m_bHasCachedEncryptionData = sal_True;
+ m_bHasCachedEncryptionData = true;
m_aEncryptionData = aEncryptionData;
}
@@ -729,15 +729,15 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
// Depending from MediaType value the package can change the compressed property itself
// Thus if Compressed property is provided it must be set as the latest one
- sal_Bool bCompressedIsSet = sal_False;
- sal_Bool bCompressed = sal_False;
+ bool bCompressedIsSet = false;
+ bool bCompressed = false;
OUString aComprPropName( "Compressed" );
OUString aMedTypePropName( "MediaType" );
for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ )
{
if ( aProps[nInd].Name.equals( aComprPropName ) )
{
- bCompressedIsSet = sal_True;
+ bCompressedIsSet = true;
aProps[nInd].Value >>= bCompressed;
}
else if ( ( m_nStorageType == embed::StorageFormats::OFOPXML || m_nStorageType == embed::StorageFormats::PACKAGE )
@@ -761,8 +761,8 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
if ( bCompressedIsSet )
{
- xPropertySet->setPropertyValue( aComprPropName, uno::makeAny( (sal_Bool)bCompressed ) );
- m_bCompressedSetExplicit = sal_True;
+ xPropertySet->setPropertyValue( aComprPropName, uno::makeAny( bCompressed ) );
+ m_bCompressedSetExplicit = true;
}
if ( m_bUseCommonEncryption )
@@ -777,9 +777,9 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
}
// the stream should be free soon, after package is stored
- m_bHasDataToFlush = sal_False;
- m_bFlushed = sal_True; // will allow to use transaction on stream level if will need it
- m_bHasInsertedStreamOptimization = sal_True;
+ m_bHasDataToFlush = false;
+ m_bFlushed = true; // will allow to use transaction on stream level if will need it
+ m_bHasInsertedStreamOptimization = true;
}
void OWriteStream_Impl::Commit()
@@ -884,8 +884,8 @@ void OWriteStream_Impl::Commit()
// the stream should be free soon, after package is stored
m_xPackageStream = xNewPackageStream;
- m_bHasDataToFlush = sal_False;
- m_bFlushed = sal_True; // will allow to use transaction on stream level if will need it
+ m_bHasDataToFlush = false;
+ m_bFlushed = true; // will allow to use transaction on stream level if will need it
}
void OWriteStream_Impl::Revert()
@@ -914,10 +914,10 @@ void OWriteStream_Impl::Revert()
m_aProps.realloc( 0 );
- m_bHasDataToFlush = sal_False;
+ m_bHasDataToFlush = false;
- m_bUseCommonEncryption = sal_True;
- m_bHasCachedEncryptionData = sal_False;
+ m_bUseCommonEncryption = true;
+ m_bHasCachedEncryptionData = false;
m_aEncryptionData.clear();
if ( m_nStorageType == embed::StorageFormats::OFOPXML )
@@ -952,7 +952,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::GetStreamProperties()
uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
const uno::Sequence< beans::PropertyValue >& aProps,
- sal_Bool bUseCommonEncryption )
+ bool bUseCommonEncryption )
{
uno::Sequence< beans::PropertyValue > aResult( aProps );
sal_Int32 nLen = aResult.getLength();
@@ -998,7 +998,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
return aResult;
}
-sal_Bool OWriteStream_Impl::IsTransacted()
+bool OWriteStream_Impl::IsTransacted()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
return ( m_pAntiImpl && m_pAntiImpl->m_bTransacted );
@@ -1032,7 +1032,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary()
AddLog( "Quiet exception" );
m_nRelInfoStatus = RELINFO_BROKEN;
- m_bOrigRelInfoBroken = sal_True;
+ m_bOrigRelInfoBroken = true;
}
}
else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -1128,7 +1128,7 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
}
else
{
- uno::Reference< io::XStream > xOwnStream = GetStream( embed::ElementModes::READ, aEncryptionData, sal_False );
+ uno::Reference< io::XStream > xOwnStream = GetStream( embed::ElementModes::READ, aEncryptionData, false );
if ( !xOwnStream.is() )
throw io::IOException(); // TODO
@@ -1166,7 +1166,7 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
}
else
{
- uno::Reference< io::XStream > xOwnStream = GetStream( embed::ElementModes::READ, sal_False );
+ uno::Reference< io::XStream > xOwnStream = GetStream( embed::ElementModes::READ, false );
if ( !xOwnStream.is() )
throw io::IOException(); // TODO
@@ -1174,7 +1174,7 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
}
}
-uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData, sal_Bool bHierarchyAccess )
+uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData, bool bHierarchyAccess )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1207,8 +1207,8 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
try {
xResultStream = GetStream_Impl( nStreamMode, bHierarchyAccess );
- m_bUseCommonEncryption = sal_False; // very important to set it to false
- m_bHasCachedEncryptionData = sal_True;
+ m_bUseCommonEncryption = false; // very important to set it to false
+ m_bHasCachedEncryptionData = true;
m_aEncryptionData = aEncryptionData;
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
@@ -1234,7 +1234,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
return xResultStream;
}
-uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, sal_Bool bHierarchyAccess )
+uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, bool bHierarchyAccess )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1268,7 +1268,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
return xResultStream;
}
-uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStreamMode, sal_Bool bHierarchyAccess )
+uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStreamMode, bool bHierarchyAccess )
{
// private method, no mutex is used
GetStreamProperties();
@@ -1337,11 +1337,11 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
if ( m_xCacheStream.is() )
CleanCacheStream();
- m_bHasDataToFlush = sal_True;
+ m_bHasDataToFlush = true;
// this call is triggered by the parent and it will recognize the change of the state
if ( m_pParent )
- m_pParent->m_bIsModified = sal_True;
+ m_pParent->m_bIsModified = true;
xStream = CreateMemoryStream( m_xContext );
m_xCacheSeek.set( xStream, uno::UNO_QUERY_THROW );
@@ -1352,11 +1352,11 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
if ( m_aTempURL.isEmpty() && !m_xCacheStream.is() && !( m_xPackageStream->getDataStream().is() ) )
{
// The stream does not exist in the storage
- m_bHasDataToFlush = sal_True;
+ m_bHasDataToFlush = true;
// this call is triggered by the parent and it will recognize the change of the state
if ( m_pParent )
- m_pParent->m_bIsModified = sal_True;
+ m_pParent->m_bIsModified = true;
xStream = GetTempFileAsStream();
}
@@ -1427,7 +1427,7 @@ void OWriteStream_Impl::InputStreamDisposed( OInputCompStream* pStream )
m_aInputStreamsList.remove( pStream );
}
-void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io::XInputStream >& xDataToCopy, const uno::Sequence< beans::PropertyValue >& aProps, sal_Bool, uno::Reference< io::XStream >& xTargetStream )
+void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io::XInputStream >& xDataToCopy, const uno::Sequence< beans::PropertyValue >& aProps, bool, uno::Reference< io::XStream >& xTargetStream )
{
uno::Reference < io::XStream > xTempFile;
if ( !xTargetStream.is() )
@@ -1524,7 +1524,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
if ( !xProps.is() )
throw uno::RuntimeException();
- sal_Bool bEncr = sal_False;
+ bool bEncr = false;
xProps->getPropertyValue( "Encrypted" ) >>= bEncr;
if ( !bEncr )
throw packages::NoEncryptionException();
@@ -1591,7 +1591,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
OUString aNewRelStreamName = aNewStreamName;
aNewRelStreamName += ".rels";
- sal_Bool bRenamed = !aOrigRelStreamName.equals( aNewRelStreamName );
+ bool bRenamed = !aOrigRelStreamName.equals( aNewRelStreamName );
if ( m_nRelInfoStatus == RELINFO_CHANGED
|| m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ
|| m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -1656,7 +1656,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
// the original stream makes no sence after this step
m_xOrigRelInfoStream = m_xNewRelInfoStream;
m_aOrigRelInfo = m_aNewRelInfo;
- m_bOrigRelInfoBroken = sal_False;
+ m_bOrigRelInfoBroken = false;
m_aNewRelInfo = uno::Sequence< uno::Sequence< beans::StringPair > >();
m_xNewRelInfoStream = uno::Reference< io::XInputStream >();
}
@@ -1671,10 +1671,10 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
// OWriteStream implementation
-OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, sal_Bool bTransacted )
+OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, bool bTransacted )
: m_pImpl( pImpl )
-, m_bInStreamDisconnected( sal_False )
-, m_bInitOnDemand( sal_True )
+, m_bInStreamDisconnected( false )
+, m_bInitOnDemand( true )
, m_nInitPosition( 0 )
, m_bTransacted( bTransacted )
{
@@ -1687,10 +1687,10 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, sal_Bool bTransacted )
m_pData = new WSInternalData_Impl( pImpl->m_rMutexRef, m_pImpl->m_nStorageType );
}
-OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStream > xStream, sal_Bool bTransacted )
+OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStream > xStream, bool bTransacted )
: m_pImpl( pImpl )
-, m_bInStreamDisconnected( sal_False )
-, m_bInitOnDemand( sal_False )
+, m_bInStreamDisconnected( false )
+, m_bInitOnDemand( false )
, m_nInitPosition( 0 )
, m_bTransacted( bTransacted )
{
@@ -1747,7 +1747,7 @@ void OWriteStream::DeInit()
m_xInStream = uno::Reference< io::XInputStream >();
m_xOutStream = uno::Reference< io::XOutputStream >();
m_xSeekable = uno::Reference< io::XSeekable >();
- m_bInitOnDemand = sal_True;
+ m_bInitOnDemand = true;
}
void OWriteStream::CheckInitOnDemand()
@@ -1770,7 +1770,7 @@ void OWriteStream::CheckInitOnDemand()
m_xSeekable->seek( m_nInitPosition );
m_nInitPosition = 0;
- m_bInitOnDemand = sal_False;
+ m_bInitOnDemand = false;
}
}
}
@@ -1799,14 +1799,14 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea
m_xSeekable->seek( 0 );
uno::Exception eThrown;
- sal_Bool bThrown = sal_False;
+ bool bThrown = false;
try {
::comphelper::OStorageHelper::CopyInputToOutput( m_xInStream, xDestOutStream );
}
catch ( const uno::Exception& e )
{
eThrown = e;
- bThrown = sal_True;
+ bThrown = true;
}
// position-related section below is critical
@@ -1855,7 +1855,7 @@ void OWriteStream::ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aG
xParentModif->setModified( sal_True );
}
else
- m_pImpl->m_pParent->m_bIsModified = sal_True;
+ m_pImpl->m_pParent->m_bIsModified = true;
}
}
@@ -2146,7 +2146,7 @@ void SAL_CALL OWriteStream::closeInput( )
// the input part of the stream stays open for internal purposes ( to allow reading during copiing )
// since it can not be reopened until output part is closed, it will be closed with output part.
- m_bInStreamDisconnected = sal_True;
+ m_bInStreamDisconnected = true;
// m_xInStream->closeInput();
// m_xInStream = uno::Reference< io::XInputStream >();
@@ -2244,7 +2244,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
m_xSeekable->seek( m_nInitPosition );
m_nInitPosition = 0;
- m_bInitOnDemand = sal_False;
+ m_bInitOnDemand = false;
}
}
@@ -2252,7 +2252,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
throw io::NotConnectedException();
m_xOutStream->writeBytes( aData );
- m_pImpl->m_bHasDataToFlush = sal_True;
+ m_pImpl->m_bHasDataToFlush = true;
ModifyParentUnlockMutex_Impl( aGuard );
}
@@ -2421,7 +2421,7 @@ void SAL_CALL OWriteStream::truncate()
xTruncate->truncate();
- m_pImpl->m_bHasDataToFlush = sal_True;
+ m_pImpl->m_bHasDataToFlush = true;
ModifyParentUnlockMutex_Impl( aGuard );
}
@@ -2592,7 +2592,7 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
if (!m_pImpl)
return sal_False;
- sal_Bool bRet = m_pImpl->IsEncrypted();
+ bool bRet = m_pImpl->IsEncrypted();
if (!bRet && m_pImpl->m_bUseCommonEncryption && m_pImpl->m_pParent)
bRet = m_pImpl->m_pParent->m_bHasCommonEncryptionData;
@@ -2919,14 +2919,14 @@ void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequ
for ( sal_Int32 nIndSource1 = 0; nIndSource1 < aEntries.getLength(); nIndSource1++ )
{
aResultSeq[nResultInd].realloc( aEntries[nIndSource1].getLength() );
- sal_Bool bHasID = sal_False;
+ bool bHasID = false;
sal_Int32 nResInd2 = 1;
for ( sal_Int32 nIndSource2 = 0; nIndSource2 < aEntries[nIndSource1].getLength(); nIndSource2++ )
if ( aEntries[nIndSource1][nIndSource2].First.equals( aIDTag ) )
{
aResultSeq[nResultInd][0] = aEntries[nIndSource1][nIndSource2];
- bHasID = sal_True;
+ bHasID = true;
}
else if ( nResInd2 < aResultSeq[nResultInd].getLength() )
aResultSeq[nResultInd][nResInd2++] = aEntries[nIndSource1][nIndSource2];
@@ -2995,14 +2995,14 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName.equals( aMediaTypeString ) )
{
// if the "Compressed" property is not set explicitly, the MediaType can change the default value
- sal_Bool bCompressedValueFromType = sal_True;
+ bool bCompressedValueFromType = true;
OUString aType;
aValue >>= aType;
if ( !m_pImpl->m_bCompressedSetExplicit )
{
if ( aType == "image/jpeg" || aType == "image/png" || aType == "image/gif" )
- bCompressedValueFromType = sal_False;
+ bCompressedValueFromType = false;
}
for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
@@ -3016,7 +3016,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
else if ( aPropertyName.equals( aCompressedString ) )
{
// if the "Compressed" property is not set explicitly, the MediaType can change the default value
- m_pImpl->m_bCompressedSetExplicit = sal_True;
+ m_pImpl->m_bCompressedSetExplicit = true;
for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
{
if ( aPropertyName.equals( m_pImpl->m_aProps[nInd].Name ) )
@@ -3026,7 +3026,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
&& aPropertyName == "UseCommonStoragePasswordEncryption" )
{
- sal_Bool bUseCommonEncryption = sal_False;
+ bool bUseCommonEncryption = false;
if ( aValue >>= bUseCommonEncryption )
{
if ( m_bInitOnDemand && m_pImpl->m_bHasInsertedStreamOptimization )
@@ -3039,11 +3039,11 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
if ( !m_pImpl->m_bUseCommonEncryption )
{
m_pImpl->SetDecrypted();
- m_pImpl->m_bUseCommonEncryption = sal_True;
+ m_pImpl->m_bUseCommonEncryption = true;
}
}
else
- m_pImpl->m_bUseCommonEncryption = sal_False;
+ m_pImpl->m_bUseCommonEncryption = false;
}
else
throw lang::IllegalArgumentException(); //TODO
@@ -3097,7 +3097,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
else
throw beans::UnknownPropertyException(); // TODO
- m_pImpl->m_bHasDataToFlush = sal_True;
+ m_pImpl->m_bHasDataToFlush = true;
ModifyParentUnlockMutex_Impl( aGuard );
}
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 5ee893fdb364..2599753d7aea 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -108,8 +108,8 @@ struct OWriteStream_Impl : public PreCreationStruct
InputStreamsList_Impl m_aInputStreamsList;
- sal_Bool m_bHasDataToFlush; // only modified elements will be sent to the original content
- sal_Bool m_bFlushed; // sending the streams is coordinated by the root storage of the package
+ bool m_bHasDataToFlush; // only modified elements will be sent to the original content
+ bool m_bFlushed; // sending the streams is coordinated by the root storage of the package
::com::sun::star::uno::Reference< ::com::sun::star::packages::XDataSinkEncrSupport > m_xPackageStream;
::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing;
@@ -120,24 +120,24 @@ struct OWriteStream_Impl : public PreCreationStruct
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aProps;
- sal_Bool m_bForceEncrypted;
+ bool m_bForceEncrypted;
- sal_Bool m_bUseCommonEncryption;
- sal_Bool m_bHasCachedEncryptionData;
+ bool m_bUseCommonEncryption;
+ bool m_bHasCachedEncryptionData;
::comphelper::SequenceAsHashMap m_aEncryptionData;
- sal_Bool m_bCompressedSetExplicit;
+ bool m_bCompressedSetExplicit;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > m_xPackage;
- sal_Bool m_bHasInsertedStreamOptimization;
+ bool m_bHasInsertedStreamOptimization;
sal_Int32 m_nStorageType;
// Relations info related data, stored in *.rels file in OFOPXML format
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xOrigRelInfoStream;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aOrigRelInfo;
- sal_Bool m_bOrigRelInfoBroken;
+ bool m_bOrigRelInfoBroken;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aNewRelInfo;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xNewRelInfoStream;
@@ -151,14 +151,14 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetTempFileAsInputStream();
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream_Impl( sal_Int32 nStreamMode,
- sal_Bool bHierarchyAccess );
+ bool bHierarchyAccess );
::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( ::com::sun::star::packages::NoEncryptionException );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > ReadPackageStreamProperties();
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > InsertOwnProps(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
- sal_Bool bUseCommonEncryption );
+ bool bUseCommonEncryption );
public:
OWriteStream_Impl(
@@ -166,9 +166,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::packages::XDataSinkEncrSupport >& xPackageStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >& xPackage,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
- sal_Bool bForceEncrypted,
+ bool bForceEncrypted,
sal_Int32 nStorageType,
- sal_Bool bDefaultCompress,
+ bool bDefaultCompress,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xRelInfoStream =
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >() );
@@ -178,24 +178,24 @@ public:
void AddLog( const OUString& aMessage );
- sal_Bool UsesCommonEncryption_Impl() { return m_bUseCommonEncryption; }
- sal_Bool HasTempFile_Impl() const { return ( m_aTempURL.getLength() != 0 ); }
- sal_Bool IsTransacted();
+ bool UsesCommonEncryption_Impl() { return m_bUseCommonEncryption; }
+ bool HasTempFile_Impl() const { return ( m_aTempURL.getLength() != 0 ); }
+ bool IsTransacted();
- sal_Bool HasWriteOwner_Impl() const { return ( m_pAntiImpl != NULL ); }
+ bool HasWriteOwner_Impl() const { return ( m_pAntiImpl != NULL ); }
void InsertIntoPackageFolder(
const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder );
- void SetToBeCommited() { m_bFlushed = sal_True; }
+ void SetToBeCommited() { m_bFlushed = true; }
- sal_Bool HasCachedEncryptionData() { return m_bHasCachedEncryptionData; }
+ bool HasCachedEncryptionData() { return m_bHasCachedEncryptionData; }
::comphelper::SequenceAsHashMap& GetCachedEncryptionData() { return m_aEncryptionData; }
- sal_Bool IsModified() { return m_bHasDataToFlush || m_bFlushed; }
+ bool IsModified() { return m_bHasDataToFlush || m_bFlushed; }
- sal_Bool IsEncrypted();
+ bool IsEncrypted();
void SetDecrypted();
void SetEncrypted( const ::comphelper::SequenceAsHashMap& aEncryptionData );
@@ -208,9 +208,9 @@ public:
void Commit();
void Revert();
- void Free( sal_Bool bMust ); // allows to try to disconnect from the temporary stream
- // in case bMust is set to sal_True the method
- // will throw exception in case the file is still busy
+ void Free( bool bMust ); // allows to try to disconnect from the temporary stream
+ // in case bMust is set to sal_True the method
+ // will throw exception in case the file is still busy
void SetModified(); // can be done only by parent storage after renaming
@@ -225,11 +225,11 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream(
sal_Int32 nStreamMode,
const ::comphelper::SequenceAsHashMap& aEncryptionData,
- sal_Bool bHierarchyAccess );
+ bool bHierarchyAccess );
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream(
sal_Int32 nStreamMode,
- sal_Bool bHierarchyAccess );
+ bool bHierarchyAccess );
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawInStream();
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetPlainRawInStream();
@@ -239,7 +239,7 @@ public:
void CreateReadonlyCopyBasedOnData(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xDataToCopy,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
- sal_Bool bUseCommonEncryption,
+ bool bUseCommonEncryption,
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream );
void GetCopyOfLastCommit( ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream );
@@ -280,14 +280,14 @@ protected:
OWriteStream_Impl* m_pImpl;
WSInternalData_Impl* m_pData;
- sal_Bool m_bInStreamDisconnected;
- sal_Bool m_bInitOnDemand;
+ bool m_bInStreamDisconnected;
+ bool m_bInitOnDemand;
sal_Int64 m_nInitPosition;
- sal_Bool m_bTransacted;
+ bool m_bTransacted;
- OWriteStream( OWriteStream_Impl* pImpl, sal_Bool bTransacted );
- OWriteStream( OWriteStream_Impl* pImpl, ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream, sal_Bool bTransacted );
+ OWriteStream( OWriteStream_Impl* pImpl, bool bTransacted );
+ OWriteStream( OWriteStream_Impl* pImpl, ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream, bool bTransacted );
void CloseOutput_Impl();
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index 08683628b3f9..c187b4bafadc 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
struct SPStreamData_Impl
{
- sal_Bool m_bInStreamBased;
+ bool m_bInStreamBased;
// the streams below are not visible from outside so there is no need to remember position
@@ -39,18 +39,18 @@ struct SPStreamData_Impl
uno::Reference< io::XInputStream > m_xOrigInStream;
uno::Reference< io::XOutputStream > m_xOrigOutStream;
- sal_Bool m_bInOpen;
- sal_Bool m_bOutOpen;
+ bool m_bInOpen;
+ bool m_bOutOpen;
SPStreamData_Impl(
- sal_Bool bInStreamBased,
+ bool bInStreamBased,
const uno::Reference< io::XStream >& xOrigStream,
const uno::Reference< io::XTruncate >& xOrigTruncate,
const uno::Reference< io::XSeekable >& xOrigSeekable,
const uno::Reference< io::XInputStream >& xOrigInStream,
const uno::Reference< io::XOutputStream >& xOrigOutStream,
- sal_Bool bInOpen,
- sal_Bool bOutOpen )
+ bool bInOpen,
+ bool bOutOpen )
: m_bInStreamBased( bInStreamBased )
, m_xOrigStream( xOrigStream )
, m_xOrigTruncate( xOrigTruncate )
@@ -96,8 +96,8 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
throw uno::RuntimeException();
sal_Int64 nPos = 0;
- sal_Bool bInOpen = sal_False;
- sal_Bool bOutOpen = sal_False;
+ bool bInOpen = false;
+ bool bOutOpen = false;
if ( m_pStreamData && m_pStreamData->m_xOrigSeekable.is() )
{
@@ -115,7 +115,7 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
CloseAll_Impl();
- m_pStreamData = new SPStreamData_Impl( sal_False,
+ m_pStreamData = new SPStreamData_Impl( false,
xStream, xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream,
bInOpen, bOutOpen );
}
@@ -130,8 +130,8 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
throw uno::RuntimeException();
sal_Int64 nPos = 0;
- sal_Bool bInOpen = sal_False;
- sal_Bool bOutOpen = sal_False;
+ bool bInOpen = false;
+ bool bOutOpen = false;
if ( m_pStreamData && m_pStreamData->m_xOrigSeekable.is() )
{
@@ -149,7 +149,7 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
CloseAll_Impl();
- m_pStreamData = new SPStreamData_Impl( sal_True,
+ m_pStreamData = new SPStreamData_Impl( true,
xNewStream, xNewTruncate, xNewSeekable, xInputStream, xNewOutStream,
bInOpen, bOutOpen );
@@ -191,12 +191,12 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen
xTargetOutStream->flush();
xTargetSeek->seek( nPos );
- sal_Bool bInOpen = m_pStreamData->m_bInOpen;
- sal_Bool bOutOpen = m_pStreamData->m_bOutOpen;
+ bool bInOpen = m_pStreamData->m_bInOpen;
+ bool bOutOpen = m_pStreamData->m_bOutOpen;
CloseAll_Impl();
- m_pStreamData = new SPStreamData_Impl( sal_False,
+ m_pStreamData = new SPStreamData_Impl( false,
xTargetStream, xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream,
bInOpen, bOutOpen );
}
@@ -217,7 +217,7 @@ uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInpu
::osl::MutexGuard aGuard( m_aMutex );
if ( m_pStreamData )
- m_pStreamData->m_bInOpen = sal_True;
+ m_pStreamData->m_bInOpen = true;
return static_cast< io::XInputStream* >( this );
}
@@ -227,7 +227,7 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
::osl::MutexGuard aGuard( m_aMutex );
if ( m_pStreamData )
- m_pStreamData->m_bOutOpen = sal_True;
+ m_pStreamData->m_bOutOpen = true;
return static_cast< io::XOutputStream* >( this );
}
@@ -300,7 +300,7 @@ void SAL_CALL SwitchablePersistenceStream::closeInput()
if ( !m_pStreamData )
throw io::NotConnectedException();
- m_pStreamData->m_bInOpen = sal_False;
+ m_pStreamData->m_bInOpen = false;
if ( !m_pStreamData->m_bOutOpen )
CloseAll_Impl();
}
@@ -353,7 +353,7 @@ void SAL_CALL SwitchablePersistenceStream::closeOutput( )
if ( !m_pStreamData )
throw io::NotConnectedException();
- m_pStreamData->m_bOutOpen = sal_False;
+ m_pStreamData->m_bOutOpen = false;
if ( !m_pStreamData->m_bInOpen )
CloseAll_Impl();
}
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 1f9ab09c6176..ffc3f2216c58 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
#define THROW_WHERE ""
#endif
-sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& xInputStream,
+bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& xInputStream,
const uno::Reference< io::XSeekable >& xSeekable )
{
if ( !xInputStream.is() || !xSeekable.is() )
@@ -57,7 +57,7 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x
return ( nRead == 4 && aData[0] == 0x50 && aData[1] == 0x4b && aData[2] == 0x03 && aData[3] == 0x04 );
}
else
- return sal_True; // allow to create a storage based on empty stream
+ return true; // allow to create a storage based on empty stream
}
uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index c25e3de2cd51..4ac877c1b9b0 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -68,9 +68,9 @@ struct StorInternalData_Impl
SotMutexHolderRef m_rSharedMutexRef;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenersContainer; // list of listeners
::cppu::OTypeCollection* m_pTypeCollection;
- sal_Bool m_bIsRoot;
+ bool m_bIsRoot;
sal_Int32 m_nStorageType; // the mode in which the storage is used
- sal_Bool m_bReadOnlyWrap;
+ bool m_bReadOnlyWrap;
OChildDispListener_Impl* m_pSubElDispListener;
@@ -79,7 +79,7 @@ struct StorInternalData_Impl
::rtl::Reference< OHierarchyHolder_Impl > m_rHierarchyHolder;
// the mutex reference MUST NOT be empty
- StorInternalData_Impl( const SotMutexHolderRef& rMutexRef, sal_Bool bRoot, sal_Int32 nStorageType, sal_Bool bReadOnlyWrap )
+ StorInternalData_Impl( const SotMutexHolderRef& rMutexRef, bool bRoot, sal_Int32 nStorageType, bool bReadOnlyWrap )
: m_rSharedMutexRef( rMutexRef )
, m_aListenersContainer( rMutexRef->GetMutex() )
, m_pTypeCollection( NULL )
@@ -161,10 +161,10 @@ StorInternalData_Impl::~StorInternalData_Impl()
delete m_pTypeCollection;
}
-SotElement_Impl::SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew )
+SotElement_Impl::SotElement_Impl( const OUString& rName, bool bStor, bool bNew )
: m_aName( rName )
, m_aOriginalName( rName )
-, m_bIsRemoved( sal_False )
+, m_bIsRemoved( false )
, m_bIsInserted( bNew )
, m_bIsStorage( bStor )
, m_pStorage( NULL )
@@ -191,18 +191,18 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > xInputStream,
, m_pAntiImpl( NULL )
, m_nStorageMode( nMode & ~embed::ElementModes::SEEKABLE )
, m_bIsModified( ( nMode & ( embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ) ) == ( embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ) )
-, m_bBroadcastModified( sal_False )
-, m_bCommited( sal_False )
-, m_bIsRoot( sal_True )
-, m_bListCreated( sal_False )
+, m_bBroadcastModified( false )
+, m_bCommited( false )
+, m_bIsRoot( true )
+, m_bListCreated( false )
, m_nModifiedListenerCount( 0 )
, m_xContext( xContext )
, m_xProperties( xProperties )
-, m_bHasCommonEncryptionData( sal_False )
+, m_bHasCommonEncryptionData( false )
, m_pParent( NULL )
-, m_bControlMediaType( sal_False )
-, m_bMTFallbackUsed( sal_False )
-, m_bControlVersion( sal_False )
+, m_bControlMediaType( false )
+, m_bMTFallbackUsed( false )
+, m_bControlVersion( false )
, m_pSwitchStream( NULL )
, m_nStorageType( nStorageType )
, m_pRelStorElement( NULL )
@@ -231,18 +231,18 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XStream > xStream,
, m_pAntiImpl( NULL )
, m_nStorageMode( nMode & ~embed::ElementModes::SEEKABLE )
, m_bIsModified( ( nMode & ( embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ) ) == ( embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ) )
-, m_bBroadcastModified( sal_False )
-, m_bCommited( sal_False )
-, m_bIsRoot( sal_True )
-, m_bListCreated( sal_False )
+, m_bBroadcastModified( false )
+, m_bCommited( false )
+, m_bIsRoot( true )
+, m_bListCreated( false )
, m_nModifiedListenerCount( 0 )
, m_xContext( xContext )
, m_xProperties( xProperties )
-, m_bHasCommonEncryptionData( sal_False )
+, m_bHasCommonEncryptionData( false )
, m_pParent( NULL )
-, m_bControlMediaType( sal_False )
-, m_bMTFallbackUsed( sal_False )
-, m_bControlVersion( sal_False )
+, m_bControlMediaType( false )
+, m_bMTFallbackUsed( false )
+, m_bControlVersion( false )
, m_pSwitchStream( NULL )
, m_nStorageType( nStorageType )
, m_pRelStorElement( NULL )
@@ -274,19 +274,19 @@ OStorage_Impl::OStorage_Impl( OStorage_Impl* pParent,
, m_pAntiImpl( NULL )
, m_nStorageMode( nMode & ~embed::ElementModes::SEEKABLE )
, m_bIsModified( ( nMode & ( embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ) ) == ( embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ) )
-, m_bBroadcastModified( sal_False )
-, m_bCommited( sal_False )
-, m_bIsRoot( sal_False )
-, m_bListCreated( sal_False )
+, m_bBroadcastModified( false )
+, m_bCommited( false )
+, m_bIsRoot( false )
+, m_bListCreated( false )
, m_nModifiedListenerCount( 0 )
, m_xPackageFolder( xPackageFolder )
, m_xPackage( xPackage )
, m_xContext( xContext )
-, m_bHasCommonEncryptionData( sal_False )
+, m_bHasCommonEncryptionData( false )
, m_pParent( pParent ) // can be empty in case of temporary readonly substorages and relation storage
-, m_bControlMediaType( sal_False )
-, m_bMTFallbackUsed( sal_False )
-, m_bControlVersion( sal_False )
+, m_bControlMediaType( false )
+, m_bMTFallbackUsed( false )
+, m_bControlVersion( false )
, m_pSwitchStream( NULL )
, m_nStorageType( nStorageType )
, m_pRelStorElement( NULL )
@@ -304,7 +304,7 @@ OStorage_Impl::~OStorage_Impl()
SAL_WARN_IF( m_bIsRoot, "package.xstor", "The root storage wrapper must be disposed already" );
try {
- m_pAntiImpl->InternalDispose( sal_False );
+ m_pAntiImpl->InternalDispose( false );
}
catch ( const uno::Exception& rException )
{
@@ -321,7 +321,7 @@ OStorage_Impl::~OStorage_Impl()
uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef;
if ( xTmp.is() )
try {
- pStorageIter->m_pPointer->InternalDispose( sal_False );
+ pStorageIter->m_pPointer->InternalDispose( false );
} catch( const uno::Exception& rException )
{
AddLog( rException.Message );
@@ -427,7 +427,7 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
if ( !xTmp.is() || pStorageIter->m_pPointer == &aStorage )
{
try {
- pStorageIter->m_pPointer->InternalDispose( sal_False );
+ pStorageIter->m_pPointer->InternalDispose( false );
} catch( const uno::Exception& rException )
{
AddLog( THROW_WHERE "Quiet exception" );
@@ -466,7 +466,7 @@ void OStorage_Impl::OpenOwnPackage()
// do not allow elements to remove themself from the old container in case of insertion to another container
aArguments[ 1 ] <<= beans::NamedValue( "AllowRemoveOnInsert",
- uno::makeAny( (sal_Bool)sal_False ) );
+ uno::makeAny( false ) );
sal_Int32 nArgNum = 2;
for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); aInd++ )
@@ -554,13 +554,13 @@ void OStorage_Impl::GetStorageProperties()
xPackageProps->getPropertyValue( MEDIATYPE_FALLBACK_USED_PROPERTY ) >>= m_bMTFallbackUsed;
xProps->getPropertyValue( "MediaType" ) >>= m_aMediaType;
- m_bControlMediaType = sal_True;
+ m_bControlMediaType = true;
}
if ( !m_bControlVersion )
{
xProps->getPropertyValue( "Version" ) >>= m_aVersion;
- m_bControlVersion = sal_True;
+ m_bControlVersion = true;
}
}
@@ -622,7 +622,7 @@ void OStorage_Impl::ReadContents()
if ( !xEnum.is() )
throw uno::RuntimeException( THROW_WHERE, uno::Reference< uno::XInterface >() );
- m_bListCreated = sal_True;
+ m_bListCreated = true;
while( xEnum->hasMoreElements() )
{
@@ -641,7 +641,7 @@ void OStorage_Impl::ReadContents()
uno::Reference< container::XNameContainer > xNameContainer( xNamed, uno::UNO_QUERY );
- SotElement_Impl* pNewElement = new SotElement_Impl( aName, xNameContainer.is(), sal_False );
+ SotElement_Impl* pNewElement = new SotElement_Impl( aName, xNameContainer.is(), false );
if ( m_nStorageType == embed::StorageFormats::OFOPXML && aName == "_rels" )
{
if ( !pNewElement->m_bIsStorage )
@@ -655,7 +655,7 @@ void OStorage_Impl::ReadContents()
if ( ( m_nStorageMode & embed::ElementModes::TRUNCATE ) == embed::ElementModes::TRUNCATE )
{
// if a storage is truncated all of it elements are marked as deleted
- pNewElement->m_bIsRemoved = sal_True;
+ pNewElement->m_bIsRemoved = true;
}
m_aChildrenList.push_back( pNewElement );
@@ -682,7 +682,7 @@ void OStorage_Impl::ReadContents()
GetStorageProperties();
}
-void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDest, sal_Bool bDirect )
+void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDest, bool bDirect )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -720,7 +720,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
if ( m_nStorageType == embed::StorageFormats::PACKAGE )
{
// if this is a root storage, the common key from current one should be moved there
- sal_Bool bIsRoot = sal_False;
+ bool bIsRoot = false;
OUString aRootString = "IsRoot";
if ( ( xPropSet->getPropertyValue( aRootString ) >>= bIsRoot ) && bIsRoot )
{
@@ -775,7 +775,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
uno::Reference< embed::XStorage > xDest,
const OUString& aName,
- sal_Bool bDirect )
+ bool bDirect )
{
SAL_WARN_IF( !xDest.is(), "package.xstor", "No destination storage!" );
SAL_WARN_IF( aName.isEmpty(), "package.xstor", "Empty element name!" );
@@ -838,7 +838,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
{
aStrProps.realloc( ++nNum );
aStrProps[nNum-1].Name = "UseCommonStoragePasswordEncryption";
- aStrProps[nNum-1].Value <<= (sal_Bool)( pElement->m_pStream->UsesCommonEncryption_Impl() );
+ aStrProps[nNum-1].Value <<= pElement->m_pStream->UsesCommonEncryption_Impl();
}
else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
{
@@ -900,11 +900,11 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
&& ( pElement->m_pStream->IsModified() || pElement->m_pStream->HasWriteOwner_Impl() ) )
{
::comphelper::SequenceAsHashMap aCommonEncryptionData;
- sal_Bool bHasCommonEncryptionData = sal_False;
+ bool bHasCommonEncryptionData = false;
try
{
aCommonEncryptionData = GetCommonRootEncryptionData();
- bHasCommonEncryptionData = sal_True;
+ bHasCommonEncryptionData = true;
}
catch( const packages::NoEncryptionException& rNoEncryptionException )
{
@@ -925,7 +925,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
uno::Reference< beans::XPropertySet > xProps( xDestStream, uno::UNO_QUERY_THROW );
xProps->setPropertyValue(
"UseCommonStoragePasswordEncryption",
- uno::Any( (sal_Bool) sal_True ) );
+ uno::Any( true ) );
}
else
{
@@ -949,7 +949,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
// it must be stored with the common storage password as well
uno::Reference< io::XStream > xOwnStream = pElement->m_pStream->GetStream( embed::ElementModes::READ,
- sal_False );
+ false );
uno::Reference< io::XStream > xDestStream =
xDest->openStreamElement( aName,
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
@@ -959,7 +959,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
uno::Reference< beans::XPropertySet > xProps( xDestStream, uno::UNO_QUERY_THROW );
xProps->setPropertyValue(
"UseCommonStoragePasswordEncryption",
- uno::Any( (sal_Bool) sal_True ) );
+ uno::Any( true ) );
}
catch( const packages::WrongPasswordException& rWrongPasswordException )
{
@@ -1009,7 +1009,7 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x
m_nStorageType);
// TODO/LATER: could use direct copying
- aTempRepresent.CopyToStorage( xNewStor, sal_False );
+ aTempRepresent.CopyToStorage( xNewStor, false );
}
void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName,
@@ -1024,7 +1024,7 @@ void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName,
xParentPackageFolder->insertByName( aName, uno::makeAny( xTunnel ) );
- m_bCommited = sal_False;
+ m_bCommited = false;
}
void OStorage_Impl::Commit()
@@ -1202,7 +1202,7 @@ void OStorage_Impl::Commit()
(*pElementIter)->m_pStorage->InsertIntoPackageFolder( (*pElementIter)->m_aName, xNewPackageFolder );
- (*pElementIter)->m_bIsInserted = sal_False;
+ (*pElementIter)->m_bIsInserted = false;
}
}
else
@@ -1221,7 +1221,7 @@ void OStorage_Impl::Commit()
(*pElementIter)->m_pStream->InsertIntoPackageFolder( (*pElementIter)->m_aName, xNewPackageFolder );
- (*pElementIter)->m_bIsInserted = sal_False;
+ (*pElementIter)->m_bIsInserted = false;
}
}
}
@@ -1272,11 +1272,11 @@ void OStorage_Impl::Commit()
else if ( !m_bCommited )
{
m_xPackageFolder = xNewPackageFolder;
- m_bCommited = sal_True;
+ m_bCommited = true;
}
// after commit the mediatype treated as the correct one
- m_bMTFallbackUsed = sal_False;
+ m_bMTFallbackUsed = false;
}
void OStorage_Impl::Revert()
@@ -1306,7 +1306,7 @@ void OStorage_Impl::Revert()
ClearElement( *pElementIter );
(*pElementIter)->m_aName = (*pElementIter)->m_aOriginalName;
- (*pElementIter)->m_bIsRemoved = sal_False;
+ (*pElementIter)->m_bIsRemoved = false;
++pElementIter;
}
@@ -1322,12 +1322,12 @@ void OStorage_Impl::Revert()
ClearElement( *pDeletedIter );
(*pDeletedIter)->m_aName = (*pDeletedIter)->m_aOriginalName;
- (*pDeletedIter)->m_bIsRemoved = sal_False;
+ (*pDeletedIter)->m_bIsRemoved = false;
}
m_aDeletedList.clear();
- m_bControlMediaType = sal_False;
- m_bControlVersion = sal_False;
+ m_bControlMediaType = false;
+ m_bControlVersion = false;
GetStorageProperties();
@@ -1382,7 +1382,7 @@ SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName )
return NULL;
}
-SotElement_Impl* OStorage_Impl::InsertStream( const OUString& aName, sal_Bool bEncr )
+SotElement_Impl* OStorage_Impl::InsertStream( const OUString& aName, bool bEncr )
{
SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" );
if ( !m_xPackage.is() )
@@ -1406,12 +1406,12 @@ SotElement_Impl* OStorage_Impl::InsertStream( const OUString& aName, sal_Bool bE
throw packages::NoEncryptionException( THROW_WHERE, uno::Reference< uno::XInterface >() );
// the mode is not needed for storage stream internal implementation
- SotElement_Impl* pNewElement = InsertElement( aName, sal_False );
- pNewElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, bEncr, m_nStorageType, sal_True );
+ SotElement_Impl* pNewElement = InsertElement( aName, false );
+ pNewElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, bEncr, m_nStorageType, true );
m_aChildrenList.push_back( pNewElement );
- m_bIsModified = sal_True;
- m_bBroadcastModified = sal_True;
+ m_bIsModified = true;
+ m_bBroadcastModified = true;
return pNewElement;
}
@@ -1446,14 +1446,14 @@ SotElement_Impl* OStorage_Impl::InsertRawStream( const OUString& aName, const un
xPackageSubStream->setRawStream( xInStrToInsert );
// the mode is not needed for storage stream internal implementation
- SotElement_Impl* pNewElement = InsertElement( aName, sal_False );
- pNewElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, sal_True, m_nStorageType, sal_False );
+ SotElement_Impl* pNewElement = InsertElement( aName, false );
+ pNewElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, true, m_nStorageType, false );
// the stream is inserted and must be treated as a commited one
pNewElement->m_pStream->SetToBeCommited();
m_aChildrenList.push_back( pNewElement );
- m_bIsModified = sal_True;
- m_bBroadcastModified = sal_True;
+ m_bIsModified = true;
+ m_bBroadcastModified = true;
return pNewElement;
}
@@ -1479,14 +1479,14 @@ OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
OStorage_Impl* pResult =
new OStorage_Impl( this, nStorageMode, xPackageSubFolder, m_xPackage, m_xContext, m_nStorageType );
- pResult->m_bIsModified = sal_True;
+ pResult->m_bIsModified = true;
return pResult;
}
SotElement_Impl* OStorage_Impl::InsertStorage( const OUString& aName, sal_Int32 nStorageMode )
{
- SotElement_Impl* pNewElement = InsertElement( aName, sal_True );
+ SotElement_Impl* pNewElement = InsertElement( aName, true );
pNewElement->m_pStorage = CreateNewStorageImpl( nStorageMode );
@@ -1495,7 +1495,7 @@ SotElement_Impl* OStorage_Impl::InsertStorage( const OUString& aName, sal_Int32
return pNewElement;
}
-SotElement_Impl* OStorage_Impl::InsertElement( const OUString& aName, sal_Bool bIsStorage )
+SotElement_Impl* OStorage_Impl::InsertElement( const OUString& aName, bool bIsStorage )
{
OSL_ENSURE( FindElement( aName ) == NULL, "Should not try to insert existing element" );
@@ -1530,7 +1530,7 @@ SotElement_Impl* OStorage_Impl::InsertElement( const OUString& aName, sal_Bool b
}
// create new element
- return new SotElement_Impl( aName, bIsStorage, sal_True );
+ return new SotElement_Impl( aName, bIsStorage, true );
}
void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode )
@@ -1581,7 +1581,7 @@ void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement )
throw uno::RuntimeException( THROW_WHERE, uno::Reference< uno::XInterface >() );
// the stream can never be inserted here, because inserted stream element holds the stream till commit or destruction
- pElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, sal_False, m_nStorageType, sal_False, GetRelInfoStreamForName( pElement->m_aOriginalName ) );
+ pElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xContext, false, m_nStorageType, false, GetRelInfoStreamForName( pElement->m_aOriginalName ) );
}
}
@@ -1624,7 +1624,7 @@ void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
}
else
{
- pElement->m_bIsRemoved = sal_True;
+ pElement->m_bIsRemoved = true;
ClearElement( pElement );
}
@@ -1647,7 +1647,7 @@ void OStorage_Impl::ClearElement( SotElement_Impl* pElement )
}
void OStorage_Impl::CloneStreamElement( const OUString& aStreamName,
- sal_Bool bEncryptionDataProvided,
+ bool bEncryptionDataProvided,
const ::comphelper::SequenceAsHashMap& aEncryptionData,
uno::Reference< io::XStream >& xTargetStream )
throw ( embed::InvalidStorageException,
@@ -1713,7 +1713,7 @@ void OStorage_Impl::CreateRelStorage()
{
if ( !m_pRelStorElement )
{
- m_pRelStorElement = new SotElement_Impl( "_rels", sal_True, sal_True );
+ m_pRelStorElement = new SotElement_Impl( "_rels", true, true );
m_pRelStorElement->m_pStorage = CreateNewStorageImpl( embed::ElementModes::WRITE );
if ( m_pRelStorElement->m_pStorage )
m_pRelStorElement->m_pStorage->m_pParent = NULL; // the relation storage is completely controlled by parent
@@ -1725,7 +1725,7 @@ void OStorage_Impl::CreateRelStorage()
if ( !m_pRelStorElement->m_pStorage )
throw uno::RuntimeException( THROW_WHERE, uno::Reference< uno::XInterface >() );
- OStorage* pResultStorage = new OStorage( m_pRelStorElement->m_pStorage, sal_False );
+ OStorage* pResultStorage = new OStorage( m_pRelStorElement->m_pStorage, false );
m_xRelStorage = uno::Reference< embed::XStorage >( (embed::XStorage*) pResultStorage );
}
}
@@ -1886,7 +1886,7 @@ OStorage::OStorage( uno::Reference< io::XInputStream > xInputStream,
: m_pImpl( new OStorage_Impl( xInputStream, nMode, xProperties, xContext, nStorageType ) )
{
m_pImpl->m_pAntiImpl = this;
- m_pData = new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, sal_False );
+ m_pData = new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, false );
}
OStorage::OStorage( uno::Reference< io::XStream > xStream,
@@ -1897,10 +1897,10 @@ OStorage::OStorage( uno::Reference< io::XStream > xStream,
: m_pImpl( new OStorage_Impl( xStream, nMode, xProperties, xContext, nStorageType ) )
{
m_pImpl->m_pAntiImpl = this;
- m_pData = new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, sal_False );
+ m_pData = new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, false );
}
-OStorage::OStorage( OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap )
+OStorage::OStorage( OStorage_Impl* pImpl, bool bReadOnlyWrap )
: m_pImpl( pImpl )
{
// this call can be done only from OStorage_Impl implementation to create child storage
@@ -1952,7 +1952,7 @@ OStorage::~OStorage()
}
}
-void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
+void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl )
{
SAL_INFO( "package.xstor", "package (mv76033) OStorage::InternalDispose" );
@@ -2063,7 +2063,7 @@ void OStorage::BroadcastModifiedIfNecessary()
if ( !m_pImpl->m_bBroadcastModified )
return;
- m_pImpl->m_bBroadcastModified = sal_False;
+ m_pImpl->m_bBroadcastModified = false;
SAL_WARN_IF( m_pData->m_bReadOnlyWrap, "package.xstor", "The storage can not be modified at all!" );
@@ -2130,7 +2130,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
}
}
-SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr )
+SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, bool bEncr )
{
::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
@@ -2357,7 +2357,7 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 1 );
try {
- m_pImpl->CopyToStorage( xDest, sal_False );
+ m_pImpl->CopyToStorage( xDest, false );
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
@@ -2432,10 +2432,10 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
uno::Reference< io::XStream > xResult;
try
{
- SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamName, nOpenMode, sal_False );
+ SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamName, nOpenMode, false );
OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
- xResult = pElement->m_pStream->GetStream( nOpenMode, sal_False );
+ xResult = pElement->m_pStream->GetStream( nOpenMode, false );
SAL_WARN_IF( !xResult.is(), "package.xstor", "The method must throw exception instead of removing empty result!" );
if ( m_pData->m_bReadOnlyWrap )
@@ -2609,7 +2609,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
if ( !pElement->m_pStorage )
throw io::IOException( THROW_WHERE, uno::Reference< uno::XInterface >() ); // TODO: general_error
- sal_Bool bReadOnlyWrap = ( ( nStorageMode & embed::ElementModes::WRITE ) != embed::ElementModes::WRITE );
+ bool bReadOnlyWrap = ( ( nStorageMode & embed::ElementModes::WRITE ) != embed::ElementModes::WRITE );
OStorage* pResultStorage = new OStorage( pElement->m_pStorage, bReadOnlyWrap );
xResult = uno::Reference< embed::XStorage >( (embed::XStorage*) pResultStorage );
@@ -2697,7 +2697,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr
try
{
uno::Reference< io::XStream > xResult;
- m_pImpl->CloneStreamElement( aStreamName, sal_False, ::comphelper::SequenceAsHashMap(), xResult );
+ m_pImpl->CloneStreamElement( aStreamName, false, ::comphelper::SequenceAsHashMap(), xResult );
if ( !xResult.is() )
throw uno::RuntimeException( THROW_WHERE, uno::Reference< uno::XInterface >() );
return xResult;
@@ -3098,8 +3098,8 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName )
m_pImpl->RemoveElement( pElement );
- m_pImpl->m_bIsModified = sal_True;
- m_pImpl->m_bBroadcastModified = sal_True;
+ m_pImpl->m_bIsModified = true;
+ m_pImpl->m_bBroadcastModified = true;
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
@@ -3194,8 +3194,8 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr
pElement->m_aName = aNewName;
- m_pImpl->m_bIsModified = sal_True;
- m_pImpl->m_bBroadcastModified = sal_True;
+ m_pImpl->m_bIsModified = true;
+ m_pImpl->m_bBroadcastModified = true;
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
@@ -3300,7 +3300,7 @@ void SAL_CALL OStorage::copyElementTo( const OUString& aElementName,
if ( xNameAccess->hasByName( aNewName ) )
throw container::ElementExistException( THROW_WHERE, uno::Reference< uno::XInterface >() );
- m_pImpl->CopyStorageElement( pElement, xDest, aNewName, sal_False );
+ m_pImpl->CopyStorageElement( pElement, xDest, aNewName, false );
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
@@ -3403,12 +3403,12 @@ void SAL_CALL OStorage::moveElementTo( const OUString& aElementName,
if ( xNameAccess->hasByName( aNewName ) )
throw container::ElementExistException( THROW_WHERE, uno::Reference< uno::XInterface >() );
- m_pImpl->CopyStorageElement( pElement, xDest, aNewName, sal_False );
+ m_pImpl->CopyStorageElement( pElement, xDest, aNewName, false );
m_pImpl->RemoveElement( pElement );
- m_pImpl->m_bIsModified = sal_True;
- m_pImpl->m_bBroadcastModified = sal_True;
+ m_pImpl->m_bIsModified = true;
+ m_pImpl->m_bBroadcastModified = true;
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
@@ -3501,10 +3501,10 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
uno::Reference< io::XStream > xResult;
try
{
- SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamName, nOpenMode, sal_True );
+ SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamName, nOpenMode, true );
OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
- xResult = pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, sal_False );
+ xResult = pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, false );
SAL_WARN_IF( !xResult.is(), "package.xstor", "The method must throw exception instead of removing empty result!" );
if ( m_pData->m_bReadOnlyWrap )
@@ -3607,7 +3607,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
try
{
uno::Reference< io::XStream > xResult;
- m_pImpl->CloneStreamElement( aStreamName, sal_True, aEncryptionData, xResult );
+ m_pImpl->CloneStreamElement( aStreamName, true, aEncryptionData, xResult );
if ( !xResult.is() )
throw uno::RuntimeException( THROW_WHERE, uno::Reference< uno::XInterface >() );
return xResult;
@@ -4084,8 +4084,8 @@ void SAL_CALL OStorage::revert()
try {
m_pImpl->Revert();
- m_pImpl->m_bIsModified = sal_False;
- m_pImpl->m_bBroadcastModified = sal_True;
+ m_pImpl->m_bIsModified = false;
+ m_pImpl->m_bBroadcastModified = true;
}
catch( const io::IOException& rIOException )
{
@@ -4187,13 +4187,13 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified )
if ( m_pData->m_bReadOnlyWrap )
throw beans::PropertyVetoException( THROW_WHERE, uno::Reference< uno::XInterface >() ); // TODO: access denied
- if ( m_pImpl->m_bIsModified != bModified )
+ if ( (m_pImpl->m_bIsModified ? 1 : 0) != bModified )
m_pImpl->m_bIsModified = bModified;
aGuard.clear();
if ( bModified )
{
- m_pImpl->m_bBroadcastModified = sal_True;
+ m_pImpl->m_bBroadcastModified = true;
BroadcastModifiedIfNecessary();
}
}
@@ -4446,7 +4446,7 @@ void SAL_CALL OStorage::dispose()
try
{
- InternalDispose( sal_True );
+ InternalDispose( true );
}
catch( const uno::RuntimeException& rRuntimeException )
{
@@ -4559,7 +4559,7 @@ void SAL_CALL OStorage::removeEncryption()
xPackPropSet->setPropertyValue( STORAGE_ENCRYPTION_KEYS_PROPERTY,
uno::makeAny( uno::Sequence< beans::NamedValue >() ) );
- m_pImpl->m_bHasCommonEncryptionData = sal_False;
+ m_pImpl->m_bHasCommonEncryptionData = false;
m_pImpl->m_aCommonEncryptionData.clear();
}
catch( const uno::RuntimeException& rRException )
@@ -4633,7 +4633,7 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu
xPackPropSet->setPropertyValue( STORAGE_ENCRYPTION_KEYS_PROPERTY,
uno::makeAny( aEncryptionMap.getAsConstNamedValueList() ) );
- m_pImpl->m_bHasCommonEncryptionData = sal_True;
+ m_pImpl->m_bHasCommonEncryptionData = true;
m_pImpl->m_aCommonEncryptionData = aEncryptionMap;
}
catch( const uno::Exception& rException )
@@ -4834,21 +4834,21 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
if ( aPropertyName == "MediaType" )
{
aValue >>= m_pImpl->m_aMediaType;
- m_pImpl->m_bControlMediaType = sal_True;
+ m_pImpl->m_bControlMediaType = true;
- m_pImpl->m_bBroadcastModified = sal_True;
- m_pImpl->m_bIsModified = sal_True;
+ m_pImpl->m_bBroadcastModified = true;
+ m_pImpl->m_bIsModified = true;
}
else if ( aPropertyName == "Version" )
{
aValue >>= m_pImpl->m_aVersion;
- m_pImpl->m_bControlVersion = sal_True;
+ m_pImpl->m_bControlVersion = true;
// this property can be set even for readonly storage
if ( !m_pData->m_bReadOnlyWrap )
{
- m_pImpl->m_bBroadcastModified = sal_True;
- m_pImpl->m_bIsModified = sal_True;
+ m_pImpl->m_bBroadcastModified = true;
+ m_pImpl->m_bIsModified = true;
}
}
else if ( ( m_pData->m_bIsRoot && ( aPropertyName == HAS_ENCRYPTED_ENTRIES_PROPERTY
@@ -4881,8 +4881,8 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
m_pImpl->m_xNewRelInfoStream = xInRelStream;
m_pImpl->m_aRelInfo = uno::Sequence< uno::Sequence< beans::StringPair > >();
m_pImpl->m_nRelInfoStatus = RELINFO_CHANGED_STREAM;
- m_pImpl->m_bBroadcastModified = sal_True;
- m_pImpl->m_bIsModified = sal_True;
+ m_pImpl->m_bBroadcastModified = true;
+ m_pImpl->m_bIsModified = true;
}
else
throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
@@ -4893,8 +4893,8 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
{
m_pImpl->m_xNewRelInfoStream = uno::Reference< io::XInputStream >();
m_pImpl->m_nRelInfoStatus = RELINFO_CHANGED;
- m_pImpl->m_bBroadcastModified = sal_True;
- m_pImpl->m_bIsModified = sal_True;
+ m_pImpl->m_bBroadcastModified = true;
+ m_pImpl->m_bIsModified = true;
}
else
throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
@@ -5414,14 +5414,14 @@ void SAL_CALL OStorage::insertRelationships( const uno::Sequence< uno::Sequence
for ( sal_Int32 nIndSource1 = 0; nIndSource1 < aEntries.getLength(); nIndSource1++ )
{
aResultSeq[nResultInd].realloc( aEntries[nIndSource1].getLength() );
- sal_Bool bHasID = sal_False;
+ bool bHasID = false;
sal_Int32 nResInd2 = 1;
for ( sal_Int32 nIndSource2 = 0; nIndSource2 < aEntries[nIndSource1].getLength(); nIndSource2++ )
if ( aEntries[nIndSource1][nIndSource2].First.equals( aIDTag ) )
{
aResultSeq[nResultInd][0] = aEntries[nIndSource1][nIndSource2];
- bHasID = sal_True;
+ bHasID = true;
}
else if ( nResInd2 < aResultSeq[nResultInd].getLength() )
aResultSeq[nResultInd][nResInd2++] = aEntries[nIndSource1][nIndSource2];
@@ -5514,7 +5514,7 @@ void SAL_CALL OStorage::insertStreamElementDirect(
if ( pElement )
throw container::ElementExistException( THROW_WHERE, uno::Reference< uno::XInterface >() );
- pElement = OpenStreamElement_Impl( aStreamName, embed::ElementModes::READWRITE, sal_False );
+ pElement = OpenStreamElement_Impl( aStreamName, embed::ElementModes::READWRITE, false );
OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
pElement->m_pStream->InsertStreamDirectly( xInStream, aProps );
@@ -5614,7 +5614,7 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
// let the element be copied directly
uno::Reference< embed::XStorage > xStorDest( xDest, uno::UNO_QUERY_THROW );
- m_pImpl->CopyStorageElement( pElement, xStorDest, aNewName, sal_True );
+ m_pImpl->CopyStorageElement( pElement, xStorDest, aNewName, true );
}
catch( const embed::InvalidStorageException& rInvalidStorageException )
{
@@ -5955,7 +5955,7 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons
try
{
uno::Reference< io::XStream > xNonconstRef = xTargetStream;
- m_pImpl->CloneStreamElement( aStreamName, sal_False, ::comphelper::SequenceAsHashMap(), xNonconstRef );
+ m_pImpl->CloneStreamElement( aStreamName, false, ::comphelper::SequenceAsHashMap(), xNonconstRef );
SAL_WARN_IF( xNonconstRef != xTargetStream, "package.xstor", "The provided stream reference seems not be filled in correctly!" );
if ( xNonconstRef != xTargetStream )
@@ -6043,11 +6043,11 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
// that must be a direct request for a stream
// the transacted version of the stream should be opened
- SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamPath, nOpenMode, sal_False );
+ SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamPath, nOpenMode, false );
OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
xResult = uno::Reference< embed::XExtendedStorageStream >(
- pElement->m_pStream->GetStream( nOpenMode, sal_True ),
+ pElement->m_pStream->GetStream( nOpenMode, true ),
uno::UNO_QUERY_THROW );
}
else
@@ -6153,11 +6153,11 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
// that must be a direct request for a stream
// the transacted version of the stream should be opened
- SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamPath, nOpenMode, sal_True );
+ SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamPath, nOpenMode, true );
OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
xResult = uno::Reference< embed::XExtendedStorageStream >(
- pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, sal_True ),
+ pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, true ),
uno::UNO_QUERY_THROW );
}
else
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 81b3c13e24ad..298341db10fe 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -77,15 +77,15 @@ struct SotElement_Impl
{
OUString m_aName;
OUString m_aOriginalName;
- sal_Bool m_bIsRemoved;
- sal_Bool m_bIsInserted;
- sal_Bool m_bIsStorage;
+ bool m_bIsRemoved;
+ bool m_bIsInserted;
+ bool m_bIsStorage;
OStorage_Impl* m_pStorage;
OWriteStream_Impl* m_pStream;
public:
- SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew );
+ SotElement_Impl( const OUString& rName, bool bStor, bool bNew );
~SotElement_Impl();
};
@@ -126,13 +126,13 @@ struct OStorage_Impl
OStorageList_Impl m_aReadOnlyWrapList; // only valid if readonly external reference exists
sal_Int32 m_nStorageMode; // open mode ( read/write/trunc/nocreate )
- sal_Bool m_bIsModified; // only modified elements will be sent to the original content
- sal_Bool m_bBroadcastModified; // will be set if notification is required
+ bool m_bIsModified; // only modified elements will be sent to the original content
+ bool m_bBroadcastModified; // will be set if notification is required
- sal_Bool m_bCommited; // sending the streams is coordinated by the root storage of the package
+ bool m_bCommited; // sending the streams is coordinated by the root storage of the package
- sal_Bool m_bIsRoot; // marks this storage as root storages that manages all commits and reverts
- sal_Bool m_bListCreated;
+ bool m_bIsRoot; // marks this storage as root storages that manages all commits and reverts
+ bool m_bListCreated;
/// Count of registered modification listeners
oslInterlockedCount m_nModifiedListenerCount;
@@ -154,17 +154,17 @@ struct OStorage_Impl
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; // ??? may be stored in properties
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; // ??? may be stored in properties
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_xProperties;
- sal_Bool m_bHasCommonEncryptionData;
+ bool m_bHasCommonEncryptionData;
::comphelper::SequenceAsHashMap m_aCommonEncryptionData;
// must be empty in case of root storage
OStorage_Impl* m_pParent;
- sal_Bool m_bControlMediaType;
+ bool m_bControlMediaType;
OUString m_aMediaType;
- sal_Bool m_bMTFallbackUsed;
+ bool m_bMTFallbackUsed;
- sal_Bool m_bControlVersion;
+ bool m_bControlVersion;
OUString m_aVersion;
SwitchablePersistenceStream* m_pSwitchStream;
@@ -229,22 +229,22 @@ struct OStorage_Impl
::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( ::com::sun::star::packages::NoEncryptionException );
void CopyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
- sal_Bool bDirect );
+ bool bDirect );
void CopyStorageElement( SotElement_Impl* pElement,
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xDest,
const OUString& aName,
- sal_Bool bDirect );
+ bool bDirect );
- void SetModified( sal_Bool bModified );
+ void SetModified( bool bModified );
SotElement_Impl* FindElement( const OUString& rName );
- SotElement_Impl* InsertStream( const OUString& aName, sal_Bool bEncr );
+ SotElement_Impl* InsertStream( const OUString& aName, bool bEncr );
SotElement_Impl* InsertRawStream( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
OStorage_Impl* CreateNewStorageImpl( sal_Int32 nStorageMode );
SotElement_Impl* InsertStorage( const OUString& aName, sal_Int32 nStorageMode );
- SotElement_Impl* InsertElement( const OUString& aName, sal_Bool bIsStorage );
+ SotElement_Impl* InsertElement( const OUString& aName, bool bIsStorage );
void OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode );
void OpenSubStream( SotElement_Impl* pElement );
@@ -257,7 +257,7 @@ struct OStorage_Impl
void CloneStreamElement(
const OUString& aStreamName,
- sal_Bool bPassProvided,
+ bool bPassProvided,
const ::comphelper::SequenceAsHashMap& aEncryptionData,
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
throw ( ::com::sun::star::embed::InvalidStorageException,
@@ -301,7 +301,7 @@ protected:
void Commit_Impl();
- SotElement_Impl* OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr );
+ SotElement_Impl* OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, bool bEncr );
void BroadcastModifiedIfNecessary();
@@ -324,11 +324,11 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
sal_Int32 nStorageType );
- OStorage( OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap );
+ OStorage( OStorage_Impl* pImpl, bool bReadOnlyWrap );
virtual ~OStorage();
- void SAL_CALL InternalDispose( sal_Bool bNotifyImpl );
+ void SAL_CALL InternalDispose( bool bNotifyImpl );
void ChildIsDisposed( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChild );
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 488e179c4463..1488c3b9d7af 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -45,9 +45,9 @@ XUnbufferedStream::XUnbufferedStream(
Reference < XInputStream > xNewZipStream,
const ::rtl::Reference< EncryptionData >& rData,
sal_Int8 nStreamMode,
- sal_Bool bIsEncrypted,
+ bool bIsEncrypted,
const OUString& aMediaType,
- sal_Bool bRecoveryMode )
+ bool bRecoveryMode )
: maMutexHolder( aMutexHolder.Is() ? aMutexHolder : SotMutexHolderRef( new SotMutexHolder ) )
, mxZipStream ( xNewZipStream )
, mxZipSeek ( xNewZipStream, UNO_QUERY )
@@ -57,7 +57,7 @@ XUnbufferedStream::XUnbufferedStream(
, maInflater ( true )
, mbRawStream ( nStreamMode == UNBUFF_STREAM_RAW || nStreamMode == UNBUFF_STREAM_WRAPPEDRAW )
, mbWrappedRaw ( nStreamMode == UNBUFF_STREAM_WRAPPEDRAW )
-, mbFinished ( sal_False )
+, mbFinished ( false )
, mnHeaderToRead ( 0 )
, mnZipCurrent ( 0 )
, mnZipEnd ( 0 )
@@ -80,8 +80,8 @@ XUnbufferedStream::XUnbufferedStream(
if (mnZipSize < 0)
throw ZipIOException("The stream seems to be broken!", uno::Reference< XInterface >());
- sal_Bool bHaveEncryptData = ( rData.is() && rData->m_aSalt.getLength() && rData->m_aInitVector.getLength() && rData->m_nIterationCount != 0 ) ? sal_True : sal_False;
- sal_Bool bMustDecrypt = ( nStreamMode == UNBUFF_STREAM_DATA && bHaveEncryptData && bIsEncrypted ) ? sal_True : sal_False;
+ bool bHaveEncryptData = ( rData.is() && rData->m_aSalt.getLength() && rData->m_aInitVector.getLength() && rData->m_nIterationCount != 0 ) ? sal_True : sal_False;
+ bool bMustDecrypt = ( nStreamMode == UNBUFF_STREAM_DATA && bHaveEncryptData && bIsEncrypted ) ? sal_True : sal_False;
if ( bMustDecrypt )
{
@@ -118,15 +118,15 @@ XUnbufferedStream::XUnbufferedStream(
, mxData ( rData )
, mnBlockSize( 1 )
, maInflater ( true )
-, mbRawStream ( sal_False )
-, mbWrappedRaw ( sal_False )
-, mbFinished ( sal_False )
+, mbRawStream ( false )
+, mbWrappedRaw ( false )
+, mbFinished ( false )
, mnHeaderToRead ( 0 )
, mnZipCurrent ( 0 )
, mnZipEnd ( 0 )
, mnZipSize ( 0 )
, mnMyCurrent ( 0 )
-, mbCheckCRC( sal_False )
+, mbCheckCRC( false )
{
// for this scenario maEntry is not set !!!
OSL_ENSURE( mxZipSeek.is(), "The stream must be seekable!\n" );
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 06b9cdd4f078..e64728408bd4 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -57,11 +57,11 @@ protected:
sal_Int32 mnBlockSize;
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext;
ZipUtils::Inflater maInflater;
- sal_Bool mbRawStream, mbWrappedRaw, mbFinished;
+ bool mbRawStream, mbWrappedRaw, mbFinished;
sal_Int16 mnHeaderToRead;
sal_Int64 mnZipCurrent, mnZipEnd, mnZipSize, mnMyCurrent;
CRC32 maCRC;
- sal_Bool mbCheckCRC;
+ bool mbCheckCRC;
public:
XUnbufferedStream(
@@ -71,9 +71,9 @@ public:
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewZipStream,
const ::rtl::Reference< EncryptionData >& rData,
sal_Int8 nStreamMode,
- sal_Bool bIsEncrypted,
+ bool bIsEncrypted,
const OUString& aMediaType,
- sal_Bool bRecoveryMode );
+ bool bRecoveryMode );
// allows to read package raw stream
XUnbufferedStream(
diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx
index 9441c9f0a9df..c5686d6c3b62 100644
--- a/package/source/zipapi/ZipEnumeration.cxx
+++ b/package/source/zipapi/ZipEnumeration.cxx
@@ -29,7 +29,7 @@ ZipEnumeration::ZipEnumeration( EntryHash & rNewEntryHash)
ZipEnumeration::~ZipEnumeration( void )
{
}
-sal_Bool SAL_CALL ZipEnumeration::hasMoreElements()
+bool SAL_CALL ZipEnumeration::hasMoreElements()
{
return (aIterator != rEntryHash.end());
}
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 15ca03958de9..8444dceadf2b 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -65,14 +65,14 @@ using ZipUtils::Inflater;
/** This class is used to read entries from a zip file
*/
-ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, sal_Bool bInitialise )
+ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise )
throw(IOException, ZipException, RuntimeException)
: aGrabber(xInput)
, aInflater( true )
, xStream(xInput)
, xSeek(xInput, UNO_QUERY)
, m_xContext ( rxContext )
-, bRecoveryMode( sal_False )
+, bRecoveryMode( false )
{
if (bInitialise)
{
@@ -84,7 +84,7 @@ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference
}
}
-ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, sal_Bool bInitialise, sal_Bool bForceRecovery, uno::Reference < XProgressHandler > xProgress )
+ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise, bool bForceRecovery, uno::Reference < XProgressHandler > xProgress )
throw(IOException, ZipException, RuntimeException)
: aGrabber(xInput)
, aInflater( true )
@@ -290,7 +290,7 @@ void ZipFile::StaticFillHeader( const ::rtl::Reference< EncryptionData >& rData,
pHeader += nMediaTypeLength;
}
-sal_Bool ZipFile::StaticFillData ( ::rtl::Reference< BaseEncryptionData > & rData,
+bool ZipFile::StaticFillData ( ::rtl::Reference< BaseEncryptionData > & rData,
sal_Int32 &rEncAlg,
sal_Int32 &rChecksumAlg,
sal_Int32 &rDerivedKeySize,