-
Notifications
You must be signed in to change notification settings - Fork 315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Proposed fix for Issue 60217 #155
Conversation
A . is only added if both Variables are filled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code does not compile:
Entering /cygdrive/c/Source/openoffice/main/sw/prj
cd .. && make -s -r -j1 && make -s -r deliverlog
[ build CXX ] sw/source/ui/fldui/changedb
changedb.cxx
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2039: 'is' : is not a member of 'rtl::OUString'
C:/Source/openoffice/main/solver/420/wntmsci12.pro/inc\rtl/ustring.hxx(71) : see declaration of 'rtl::OUString'
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2146: syntax error : missing ')' before identifier 'and'
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2065: 'and' : undeclared identifier
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2146: syntax error : missing ';' before identifier 'rDBData'
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2039: 'is' : is not a member of 'rtl::OUString'
C:/Source/openoffice/main/solver/420/wntmsci12.pro/inc\rtl/ustring.hxx(71) : see declaration of 'rtl::OUString'
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2059: syntax error : ')'
c:/Source/openoffice/main/sw/source/ui/fldui/changedb.cxx(337) : error C2143: syntax error : missing ';' before '{'
make: *** No rule to make target '/cygdrive/c/Source/openoffice/main/solver/420/wntmsci12.pro/workdir/CxxObject/sw/source/ui/fldui/changedb.o', needed by '/cygdrive/c/Source/openoffice/main/solver/420/wntmsci12.pro/workdir/LinkTarget/Library/iswui.lib'. Stop.
dmake: Error code 2, while making 'all'
1 module(s):
sw
need(s) to be rebuilt
Compiles now on docker container. Sadly the dockerbuild crashes on my system for some (other) reason. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Builds now and the output looks like expected.
No dot when no database is selected.
If nobody else wants to review, It think we can merge this PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I suggest to squash these commits when merging.
@leginee: Can you please "squash and merge"? |
A dot is only added if both Variables rDBData.sDataSource and sCommand contain something. Otherwise the dot is not added Co-authored-by: Matthias Seidel <mseidel@apache.org> (cherry picked from commit b0300d3)
A dot is only added if both Variables rDBData.sDataSource and sCommand contain something. Otherwise the dot is not added Co-authored-by: Matthias Seidel <mseidel@apache.org> (cherry picked from commit b0300d3)
I have added the if clause, with the expectation it fullfills the goal czeslav formulated in comment 9
Did not build the PR. Needs testing, but can be a base of discussion.